ui_bibz 2.5.6 → 3.0.0.alpha2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (256) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +3 -2
  3. data/.rubocop.yml +78 -0
  4. data/.ruby-gemset +1 -0
  5. data/.ruby-version +1 -0
  6. data/Gemfile +1 -0
  7. data/Gemfile.lock +90 -102
  8. data/README.md +9 -52
  9. data/Rakefile +3 -2
  10. data/bin/test +7 -0
  11. data/config/initializers/will_paginate.rb +2 -1
  12. data/lib/ui_bibz.rb +17 -2
  13. data/lib/ui_bibz/concerns/models/searchable.rb +3 -3
  14. data/lib/ui_bibz/helpers/ui/core/boxes_helper.rb +9 -1
  15. data/lib/ui_bibz/helpers/ui/core/forms_helper.rb +18 -0
  16. data/lib/ui_bibz/helpers/ui/core/layouts_helper.rb +10 -2
  17. data/lib/ui_bibz/helpers/ui/core/lists_helper.rb +1 -1
  18. data/lib/ui_bibz/helpers/ui/core/notifications_helper.rb +9 -5
  19. data/lib/ui_bibz/helpers/ui/ux_helper.rb +2 -6
  20. data/lib/ui_bibz/infos.rb +11 -5
  21. data/lib/ui_bibz/inputs/ui_bibz_form/ui_bibz_form_builder.rb +15 -2
  22. data/lib/ui_bibz/inputs/ui_bibz_inputs/base_input.rb +0 -4
  23. data/lib/ui_bibz/inputs/ui_bibz_inputs/collection_input.rb +6 -9
  24. data/lib/ui_bibz/inputs/ui_bibz_inputs/ui_choice_field_input.rb +23 -0
  25. data/lib/ui_bibz/inputs/ui_bibz_inputs/ui_slider_field_input.rb +11 -0
  26. data/lib/ui_bibz/rails/engine.rb +2 -13
  27. data/lib/ui_bibz/railtie.rb +6 -0
  28. data/lib/ui_bibz/ui/concerns/card_itemable_concern.rb +65 -0
  29. data/lib/ui_bibz/ui/concerns/html_concern.rb +16 -0
  30. data/lib/ui_bibz/ui/core/boxes/card.rb +5 -50
  31. data/lib/ui_bibz/ui/core/boxes/card_accordion.rb +2 -0
  32. data/lib/ui_bibz/ui/core/boxes/card_column.rb +3 -1
  33. data/lib/ui_bibz/ui/core/boxes/card_deck.rb +3 -1
  34. data/lib/ui_bibz/ui/core/boxes/card_grid.rb +60 -0
  35. data/lib/ui_bibz/ui/core/boxes/card_group.rb +3 -1
  36. data/lib/ui_bibz/ui/core/boxes/components/body/card_body_link.rb +0 -3
  37. data/lib/ui_bibz/ui/core/boxes/components/body/card_body_subtitle.rb +47 -0
  38. data/lib/ui_bibz/ui/core/boxes/components/body/card_body_text.rb +0 -3
  39. data/lib/ui_bibz/ui/core/boxes/components/body/card_body_title.rb +1 -4
  40. data/lib/ui_bibz/ui/core/boxes/components/card_body.rb +7 -0
  41. data/lib/ui_bibz/ui/core/boxes/components/card_col.rb +65 -0
  42. data/lib/ui_bibz/ui/core/boxes/components/card_footer.rb +0 -3
  43. data/lib/ui_bibz/ui/core/boxes/components/card_header.rb +2 -4
  44. data/lib/ui_bibz/ui/core/boxes/components/card_image.rb +0 -3
  45. data/lib/ui_bibz/ui/core/boxes/components/card_row.rb +65 -0
  46. data/lib/ui_bibz/ui/core/boxes/components/card_tab_group.rb +0 -4
  47. data/lib/ui_bibz/ui/core/boxes/jumbotron.rb +1 -4
  48. data/lib/ui_bibz/ui/core/component.rb +16 -9
  49. data/lib/ui_bibz/ui/core/forms/buttons/button.rb +1 -1
  50. data/lib/ui_bibz/ui/core/forms/buttons/button_group.rb +9 -11
  51. data/lib/ui_bibz/ui/core/forms/buttons/button_refresh.rb +0 -3
  52. data/lib/ui_bibz/ui/core/forms/buttons/components/button_group_dropdown.rb +0 -3
  53. data/lib/ui_bibz/ui/core/forms/buttons/components/button_group_split_dropdown.rb +0 -3
  54. data/lib/ui_bibz/ui/core/forms/choices/box_switch_field.rb +7 -10
  55. data/lib/ui_bibz/ui/core/forms/choices/checkbox_field.rb +8 -7
  56. data/lib/ui_bibz/ui/core/forms/choices/choice_group.rb +22 -2
  57. data/lib/ui_bibz/ui/core/forms/choices/components/choice.rb +24 -12
  58. data/lib/ui_bibz/ui/core/forms/choices/radio_field.rb +11 -6
  59. data/lib/ui_bibz/ui/core/forms/choices/switch_field.rb +1 -5
  60. data/lib/ui_bibz/ui/core/forms/dates/date_picker_field.rb +12 -15
  61. data/lib/ui_bibz/ui/core/forms/dropdowns/components/dropdown_divider.rb +0 -1
  62. data/lib/ui_bibz/ui/core/forms/dropdowns/components/dropdown_header.rb +0 -3
  63. data/lib/ui_bibz/ui/core/forms/dropdowns/dropdown.rb +8 -13
  64. data/lib/ui_bibz/ui/core/forms/dropdowns/split_dropdown.rb +0 -3
  65. data/lib/ui_bibz/ui/core/forms/files/file_field.rb +20 -10
  66. data/lib/ui_bibz/ui/core/forms/numbers/formula_field.rb +16 -8
  67. data/lib/ui_bibz/ui/core/forms/numbers/number_field.rb +20 -3
  68. data/lib/ui_bibz/ui/core/forms/numbers/range_field.rb +33 -5
  69. data/lib/ui_bibz/ui/core/forms/numbers/slider_field.rb +132 -0
  70. data/lib/ui_bibz/ui/core/forms/numbers/slider_header.rb +71 -0
  71. data/lib/ui_bibz/ui/core/forms/selects/abstract_select.rb +0 -3
  72. data/lib/ui_bibz/ui/core/forms/selects/dropdown_select_field.rb +6 -9
  73. data/lib/ui_bibz/ui/core/forms/selects/multi_column_field.rb +0 -3
  74. data/lib/ui_bibz/ui/core/forms/selects/multi_select_field.rb +0 -3
  75. data/lib/ui_bibz/ui/core/forms/selects/select_field.rb +2 -5
  76. data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_addon.rb +1 -4
  77. data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_button.rb +0 -3
  78. data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_button_group.rb +0 -3
  79. data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_button_link.rb +0 -3
  80. data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_button_refresh.rb +1 -12
  81. data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_checkbox_field.rb +9 -4
  82. data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_dropdown.rb +0 -3
  83. data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_radio_field.rb +9 -4
  84. data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_switch_field.rb +0 -3
  85. data/lib/ui_bibz/ui/core/forms/surrounds/surround_field.rb +1 -4
  86. data/lib/ui_bibz/ui/core/forms/textareas/markdown_editor_field.rb +4 -7
  87. data/lib/ui_bibz/ui/core/forms/texts/auto_complete_field.rb +2 -5
  88. data/lib/ui_bibz/ui/core/forms/texts/text_field.rb +0 -3
  89. data/lib/ui_bibz/ui/core/icons/components/glyph_counter.rb +0 -3
  90. data/lib/ui_bibz/ui/core/icons/components/glyph_text.rb +1 -4
  91. data/lib/ui_bibz/ui/core/icons/glyph.rb +1 -4
  92. data/lib/ui_bibz/ui/core/icons/star.rb +0 -3
  93. data/lib/ui_bibz/ui/core/layouts/col.rb +5 -42
  94. data/lib/ui_bibz/ui/core/layouts/container.rb +9 -6
  95. data/lib/ui_bibz/ui/core/layouts/row.rb +32 -2
  96. data/lib/ui_bibz/ui/core/lists/components/list.rb +6 -8
  97. data/lib/ui_bibz/ui/core/lists/components/list/list_body.rb +0 -3
  98. data/lib/ui_bibz/ui/core/lists/components/list/list_header.rb +0 -3
  99. data/lib/ui_bibz/ui/core/lists/list_group.rb +9 -6
  100. data/lib/ui_bibz/ui/core/navigations/breadcrumb.rb +3 -2
  101. data/lib/ui_bibz/ui/core/navigations/components/breadcrumb_link.rb +0 -3
  102. data/lib/ui_bibz/ui/core/navigations/components/nav_dropdown.rb +1 -4
  103. data/lib/ui_bibz/ui/core/navigations/components/nav_link.rb +3 -1
  104. data/lib/ui_bibz/ui/core/navigations/components/nav_link_link.rb +14 -5
  105. data/lib/ui_bibz/ui/core/navigations/components/nav_link_list.rb +0 -4
  106. data/lib/ui_bibz/ui/core/navigations/components/nav_link_span.rb +1 -4
  107. data/lib/ui_bibz/ui/core/navigations/components/nav_text.rb +0 -3
  108. data/lib/ui_bibz/ui/core/navigations/components/navbar_brand.rb +0 -3
  109. data/lib/ui_bibz/ui/core/navigations/components/navbar_form.rb +4 -4
  110. data/lib/ui_bibz/ui/core/navigations/components/navbar_nav.rb +1 -4
  111. data/lib/ui_bibz/ui/core/navigations/components/navbar_text.rb +0 -3
  112. data/lib/ui_bibz/ui/core/navigations/components/pagination_link.rb +0 -3
  113. data/lib/ui_bibz/ui/core/navigations/components/toolbar_form.rb +3 -3
  114. data/lib/ui_bibz/ui/core/navigations/link.rb +0 -3
  115. data/lib/ui_bibz/ui/core/navigations/nav.rb +37 -10
  116. data/lib/ui_bibz/ui/core/navigations/navbar.rb +28 -7
  117. data/lib/ui_bibz/ui/core/navigations/pagination.rb +3 -1
  118. data/lib/ui_bibz/ui/core/navigations/tab_group.rb +10 -5
  119. data/lib/ui_bibz/ui/core/navigations/toolbar.rb +2 -0
  120. data/lib/ui_bibz/ui/core/notifications/alert.rb +2 -2
  121. data/lib/ui_bibz/ui/core/notifications/badge.rb +2 -5
  122. data/lib/ui_bibz/ui/core/notifications/components/alert_body.rb +0 -3
  123. data/lib/ui_bibz/ui/core/notifications/components/alert_header.rb +4 -10
  124. data/lib/ui_bibz/ui/core/notifications/components/bar.rb +0 -3
  125. data/lib/ui_bibz/ui/core/notifications/components/toast_body.rb +0 -3
  126. data/lib/ui_bibz/ui/core/notifications/components/toast_header.rb +1 -6
  127. data/lib/ui_bibz/ui/core/notifications/progress_bar.rb +7 -5
  128. data/lib/ui_bibz/ui/core/notifications/spinner.rb +0 -3
  129. data/lib/ui_bibz/ui/core/notifications/toast.rb +14 -3
  130. data/lib/ui_bibz/ui/core/windows/components/modal_body.rb +0 -3
  131. data/lib/ui_bibz/ui/core/windows/components/modal_footer.rb +0 -3
  132. data/lib/ui_bibz/ui/core/windows/components/modal_header.rb +1 -7
  133. data/lib/ui_bibz/ui/core/windows/modal.rb +61 -14
  134. data/lib/ui_bibz/ui/extensions/core/component/glyph_extension.rb +4 -2
  135. data/lib/ui_bibz/ui/extensions/core/component/popover_extension.rb +9 -9
  136. data/lib/ui_bibz/ui/extensions/core/forms/connect_extension.rb +2 -2
  137. data/lib/ui_bibz/ui/ux/containers/components/panel_body.rb +0 -3
  138. data/lib/ui_bibz/ui/ux/containers/components/panel_column.rb +2 -0
  139. data/lib/ui_bibz/ui/ux/containers/components/panel_deck.rb +2 -0
  140. data/lib/ui_bibz/ui/ux/containers/components/panel_footer.rb +0 -3
  141. data/lib/ui_bibz/ui/ux/containers/components/panel_group.rb +2 -0
  142. data/lib/ui_bibz/ui/ux/containers/components/panel_header.rb +1 -4
  143. data/lib/ui_bibz/ui/ux/containers/components/panel_tab_group.rb +0 -4
  144. data/lib/ui_bibz/ui/ux/containers/components/panel_toolbar.rb +0 -3
  145. data/lib/ui_bibz/ui/ux/containers/panel.rb +4 -2
  146. data/lib/ui_bibz/ui/ux/tables/components/thead.rb +0 -3
  147. data/lib/ui_bibz/ui/ux/tables/table.rb +2 -4
  148. data/lib/ui_bibz/ui/ux/tables/table_card.rb +4 -3
  149. data/lib/ui_bibz/ui/ux/tables/table_search_field.rb +5 -5
  150. data/lib/ui_bibz/utils/breakdown_class_name_generator.rb +69 -0
  151. data/lib/ui_bibz/utils/internationalization.rb +1 -1
  152. data/lib/ui_bibz/utils/screwdriver.rb +16 -10
  153. data/package.json +5 -0
  154. data/test/dummy/Rakefile +1 -1
  155. data/test/dummy/app/javascripts/packs/index.js +3 -0
  156. data/test/dummy/app/views/layouts/application.html.erb +4 -1
  157. data/{app/ui/.keep → test/dummy/app/views/users/index.html.erb} +0 -0
  158. data/test/dummy/bin/setup +17 -13
  159. data/test/dummy/config.ru +2 -1
  160. data/test/dummy/config/application.rb +1 -0
  161. data/test/dummy/config/cable.yml +10 -0
  162. data/test/dummy/config/database.yml +1 -1
  163. data/test/dummy/config/environment.rb +1 -1
  164. data/test/dummy/config/environments/development.rb +33 -12
  165. data/test/dummy/config/environments/production.rb +52 -19
  166. data/test/dummy/config/environments/test.rb +18 -12
  167. data/test/dummy/config/initializers/application_controller_renderer.rb +9 -0
  168. data/test/dummy/config/initializers/assets.rb +4 -3
  169. data/test/dummy/config/initializers/backtrace_silencers.rb +0 -1
  170. data/test/dummy/config/initializers/content_security_policy.rb +29 -0
  171. data/test/dummy/config/initializers/cookies_serializer.rb +2 -0
  172. data/test/dummy/config/initializers/inflections.rb +0 -1
  173. data/test/dummy/config/initializers/mime_types.rb +0 -1
  174. data/test/dummy/config/initializers/wrap_parameters.rb +2 -2
  175. data/test/dummy/config/puma.rb +40 -0
  176. data/test/dummy/config/routes.rb +3 -0
  177. data/test/dummy/config/spring.rb +8 -0
  178. data/test/dummy/config/storage.yml +34 -0
  179. data/test/dummy/db/migrate/20150123191805_create_users.rb +1 -1
  180. data/test/dummy/db/schema.rb +24 -24
  181. data/test/dummy/public/404.html +6 -6
  182. data/test/dummy/public/422.html +6 -6
  183. data/test/dummy/public/500.html +6 -6
  184. data/test/dummy/public/apple-touch-icon-precomposed.png +0 -0
  185. data/test/dummy/public/apple-touch-icon.png +0 -0
  186. data/test/dummy/storage/.keep +0 -0
  187. data/test/simple_form_test.rb +45 -22
  188. data/test/store_test.rb +5 -5
  189. data/test/test_helper.rb +18 -9
  190. data/test/ui/core/boxes/card_grid_test.rb +17 -0
  191. data/test/ui/core/boxes/card_test.rb +45 -11
  192. data/test/ui/core/boxes/jumbotron_test.rb +2 -2
  193. data/test/ui/core/component_test.rb +1 -1
  194. data/test/ui/core/forms/buttons/button_link_test.rb +1 -1
  195. data/test/ui/core/forms/buttons/button_test.rb +2 -2
  196. data/test/ui/core/forms/choices/checkbox_field_test.rb +1 -1
  197. data/test/ui/core/forms/choices/choice_group_test.rb +11 -9
  198. data/test/ui/core/forms/choices/radio_field_test.rb +1 -1
  199. data/test/ui/core/forms/dates/date_picker_field_test.rb +1 -1
  200. data/test/ui/core/forms/files/file_field_test.rb +12 -0
  201. data/test/ui/core/forms/numbers/formula_field_test.rb +1 -1
  202. data/test/ui/core/forms/numbers/range_field_test.rb +23 -2
  203. data/test/ui/core/forms/numbers/slider_field_test.rb +26 -0
  204. data/test/ui/core/forms/selects/dropdown_select_field_test.rb +10 -10
  205. data/test/ui/core/forms/selects/multi_column_field_test.rb +1 -1
  206. data/test/ui/core/forms/selects/multi_select_field_test.rb +2 -2
  207. data/test/ui/core/forms/selects/select_field_test.rb +3 -3
  208. data/test/ui/core/forms/surrounds/surround_field_test.rb +15 -3
  209. data/test/ui/core/forms/textareas/markdown_editor_field_test.rb +1 -1
  210. data/test/ui/core/forms/texts/auto_complete_field_test.rb +8 -8
  211. data/test/ui/core/forms/texts/text_field_test.rb +2 -2
  212. data/test/ui/core/layouts/col_test.rb +11 -2
  213. data/test/ui/core/layouts/container_test.rb +15 -1
  214. data/test/ui/core/layouts/row_test.rb +68 -3
  215. data/test/ui/core/lists/list_group_test.rb +1 -1
  216. data/test/ui/core/navigations/breadcrumb_test.rb +1 -1
  217. data/test/ui/core/navigations/link_test.rb +1 -1
  218. data/test/ui/core/navigations/nav_test.rb +11 -0
  219. data/test/ui/core/navigations/navbar_test.rb +4 -4
  220. data/test/ui/core/notifications/alert_test.rb +2 -2
  221. data/test/ui/core/notifications/badge_test.rb +3 -3
  222. data/test/ui/core/notifications/progress_bar_test.rb +1 -1
  223. data/test/ui/core/notifications/toast_test.rb +10 -1
  224. data/test/ui/core/windows/modal_test.rb +15 -1
  225. data/test/ui/utils/breakdown_class_name_generator_test.rb +60 -0
  226. data/test/ui/ux/containers/panel_test.rb +5 -5
  227. data/test/ui/ux/tables/table_test.rb +6 -6
  228. data/test/ui_bibz_test.rb +1 -1
  229. data/ui_bibz.gemspec +16 -16
  230. metadata +100 -105
  231. data/app/assets/javascripts/fix_bootstrap.coffee +0 -7
  232. data/app/assets/javascripts/form.coffee +0 -83
  233. data/app/assets/javascripts/formula.coffee +0 -69
  234. data/app/assets/javascripts/input-connected.coffee +0 -101
  235. data/app/assets/javascripts/interface.coffee +0 -55
  236. data/app/assets/javascripts/jquery.multi-select-extend.coffee +0 -38
  237. data/app/assets/javascripts/table.coffee +0 -36
  238. data/app/assets/javascripts/ui_bibz.coffee.erb +0 -75
  239. data/app/assets/stylesheets/_custom_variables.sass +0 -20
  240. data/app/assets/stylesheets/_panel.scss +0 -315
  241. data/app/assets/stylesheets/bootstrap-switch.sass +0 -159
  242. data/app/assets/stylesheets/boxes.sass +0 -5
  243. data/app/assets/stylesheets/containers.sass +0 -2
  244. data/app/assets/stylesheets/fix-bootstrap-4.sass +0 -19
  245. data/app/assets/stylesheets/fix_addon.sass +0 -216
  246. data/app/assets/stylesheets/forms.sass +0 -91
  247. data/app/assets/stylesheets/navigations.sass +0 -17
  248. data/app/assets/stylesheets/notifications.sass +0 -42
  249. data/app/assets/stylesheets/tables.sass +0 -66
  250. data/app/assets/stylesheets/ui_bibz.sass.erb +0 -55
  251. data/lib/generators/ui_bibz/install_generator.rb +0 -17
  252. data/lib/generators/ui_bibz/templates/ui_bibz_initializer.rb +0 -5
  253. data/lib/ui_bibz/ui/core/icons/glyph_group.rb +0 -101
  254. data/test/dummy/bin/bundle +0 -5
  255. data/test/ui/core/forms/files/text_field_test.rb +0 -12
  256. data/test/ui/core/icons/glyph_group_test.rb +0 -37
@@ -17,9 +17,6 @@ module UiBibz::Ui::Core::Lists::Components
17
17
  # You can pass arguments in options attribute:
18
18
  class ListBody < UiBibz::Ui::Core::Component
19
19
  # See UiBibz::Ui::Core::Component.initialize
20
- def initialize(content = nil, options = nil, html_options = nil, &block)
21
- super
22
- end
23
20
 
24
21
  # Render html tag
25
22
  def pre_render
@@ -17,9 +17,6 @@ module UiBibz::Ui::Core::Lists::Components
17
17
  # You can pass arguments in options attribute:
18
18
  class ListHeader < UiBibz::Ui::Core::Component
19
19
  # See UiBibz::Ui::Core::Component.initialize
20
- def initialize(content = nil, options = nil, html_options = nil, &block)
21
- super
22
- end
23
20
 
24
21
  # Render html tag
25
22
  def pre_render
@@ -22,7 +22,7 @@ module UiBibz::Ui::Core::Lists
22
22
  #
23
23
  # ==== Signatures
24
24
  #
25
- # UiBibz::Ui::Core::ListGroup.new().tap |lg|
25
+ # UiBibz::Ui::Core::ListGroup.new.tap |lg|
26
26
  # ...
27
27
  # lg.list content = nil, options = nil, html_options = nil, &block
28
28
  # ...
@@ -30,7 +30,7 @@ module UiBibz::Ui::Core::Lists
30
30
  #
31
31
  # ==== Examples
32
32
  #
33
- # UiBibz::Ui::Core::ListGroup.new().tap do |d|
33
+ # UiBibz::Ui::Core::ListGroup.new.tap do |d|
34
34
  # d.list 'Test', status: :success
35
35
  # d.list 'Test2', status: :primary
36
36
  # end.render
@@ -40,7 +40,7 @@ module UiBibz::Ui::Core::Lists
40
40
  # d.list(status: :primary) do
41
41
  # 'Test 2'
42
42
  # end
43
- # d.list(tap: true, state: :active) do |l|
43
+ # d.list(state: :active) do |l|
44
44
  # l.header 'My title', nil, class: 'my-title'
45
45
  # l.body do
46
46
  # 'My content'
@@ -50,12 +50,12 @@ module UiBibz::Ui::Core::Lists
50
50
  #
51
51
  # ==== Helper
52
52
  #
53
- # list_group( options = { tap: true }, html_options = {}) do |l|
53
+ # list_group( options = {}, html_options = {}) do |l|
54
54
  # l.list(content, options = {}, html_options = {})
55
55
  # l.list(options = {}, html_options = {}) do
56
56
  # content
57
57
  # end
58
- # l.list(options = { tap: true }, html_options = {}) do |li|
58
+ # l.list(options = {}, html_options = {}) do |li|
59
59
  # li.header(content, options = {}, html_options = {})
60
60
  # # or
61
61
  # li.header(options = {}, html_options = {}) do
@@ -71,6 +71,8 @@ module UiBibz::Ui::Core::Lists
71
71
  # end
72
72
  #
73
73
  class ListGroup < UiBibz::Ui::Core::Component
74
+ include UiBibz::Ui::Concerns::HtmlConcern
75
+
74
76
  # See UiBibz::Ui::Core::Component.initialize
75
77
  def initialize(content = nil, options = nil, html_options = nil, &block)
76
78
  super
@@ -87,7 +89,8 @@ module UiBibz::Ui::Core::Lists
87
89
  def list(content = nil, options = {}, html_options = nil, &block)
88
90
  options = options.merge({ tag_type: @options[:tag_type] }) unless @options[:tag_type].nil?
89
91
 
90
- @lists << if tap?(content, options)
92
+ @lists << if tapped?(block)
93
+ content = (content || {}).merge(tap: true)
91
94
  UiBibz::Ui::Core::Lists::Components::List.new(content, options, html_options).tap(&block).render
92
95
  else
93
96
  UiBibz::Ui::Core::Lists::Components::List.new(content, options, html_options, &block).render
@@ -8,7 +8,6 @@ module UiBibz::Ui::Core::Navigations
8
8
  # Separators are automatically added in CSS through +:before+ and +content+.
9
9
  #
10
10
  # This element is an extend of UiBibz::Ui::Core::Component.
11
- # You can use tap method to add link items.
12
11
  #
13
12
  # ==== Attributes
14
13
  #
@@ -56,7 +55,7 @@ module UiBibz::Ui::Core::Navigations
56
55
  #
57
56
  # ==== Helper
58
57
  #
59
- # ui_breadcrumb({tap: true}) do |b|
58
+ # ui_breadcrumb do |b|
60
59
  # b.link(content, options = {}, html_options = {})
61
60
  # b.link(options = {}, html_options = {}) do
62
61
  # content
@@ -69,6 +68,8 @@ module UiBibz::Ui::Core::Navigations
69
68
  # ui_breadcrumb(@users, { link_label: name, link_url: user_path(:id) })
70
69
  #
71
70
  class Breadcrumb < UiBibz::Ui::Core::Component
71
+ include UiBibz::Ui::Concerns::HtmlConcern
72
+
72
73
  # See UiBibz::Ui::Core::Component.initialize
73
74
  def initialize(content = nil, options = nil, html_options = nil, &block)
74
75
  super
@@ -41,9 +41,6 @@ module UiBibz::Ui::Core::Navigations::Components
41
41
  #
42
42
  class BreadcrumbLink < UiBibz::Ui::Core::Navigations::Link
43
43
  # See UiBibz::Ui::Core::Component.initialize
44
- def initialize(content = nil, options = nil, html_options = nil, &block)
45
- super
46
- end
47
44
 
48
45
  # Render html tag
49
46
  def pre_render
@@ -44,9 +44,6 @@ module UiBibz::Ui::Core::Navigations
44
44
  #
45
45
  class NavDropdown < UiBibz::Ui::Core::Forms::Dropdowns::Dropdown
46
46
  # See UiBibz::Ui::Core::Dropdown.initialize
47
- def initialize(content, options = nil, html_options = nil, &block)
48
- super
49
- end
50
47
 
51
48
  # Render html tag
52
49
  def pre_render
@@ -63,7 +60,7 @@ module UiBibz::Ui::Core::Navigations
63
60
  end
64
61
 
65
62
  def link_html
66
- link_to button_content, '#', class: join_classes(size, 'dropdown-toggle', 'nav-link'), 'data-toggle' => 'dropdown', 'aria-expanded' => false
63
+ link_to button_content, '#', class: join_classes(size, state, 'dropdown-toggle', 'nav-link'), 'data-toggle' => 'dropdown', 'aria-expanded' => false
67
64
  end
68
65
  end
69
66
  end
@@ -41,6 +41,8 @@ module UiBibz::Ui::Core::Navigations
41
41
  # end.render
42
42
  #
43
43
  class NavLink < UiBibz::Ui::Core::Component
44
+ include UiBibz::Ui::Concerns::HtmlConcern
45
+
44
46
  # See UiBibz::Ui::Core::Component.initialize
45
47
  def initialize(content = nil, options = nil, html_options = nil, &block)
46
48
  super
@@ -49,7 +51,7 @@ module UiBibz::Ui::Core::Navigations
49
51
 
50
52
  # Render html tag
51
53
  def pre_render
52
- if options[:nav_tags] == :a || options[:nav_type] == 'nav-links'
54
+ if options[:nav_tags] == :a || %w[nav-links list-group].include?(options[:nav_type])
53
55
  UiBibz::Ui::Core::Navigations::NavLinkLink.new(content, options, html_options).render
54
56
  else
55
57
  cont = if options[:tag_type] == :span
@@ -20,9 +20,6 @@ module UiBibz::Ui::Core::Navigations
20
20
  #
21
21
  class NavLinkLink < UiBibz::Ui::Core::Component
22
22
  # UiBibz::Ui::Core::Component.initialize
23
- def initialize(content = nil, options = nil, html_options = nil, &block)
24
- super
25
- end
26
23
 
27
24
  # Render html tag
28
25
  def pre_render
@@ -35,11 +32,23 @@ module UiBibz::Ui::Core::Navigations
35
32
  private
36
33
 
37
34
  def component_html_classes
38
- 'nav-link'
35
+ if options[:nav_type] == 'list-group'
36
+ 'list-group-item list-group-item-action'
37
+ else
38
+ 'nav-link'
39
+ end
39
40
  end
40
41
 
41
42
  def component_html_options
42
- options[:nav_type] == 'nav-tabs' ? { 'data-toggle' => 'tab', role: 'tab' } : {}
43
+ html_tag_base = { 'data-toggle' => 'tab', role: 'tab' }
44
+ case options[:nav_type]
45
+ when 'nav-tabs'
46
+ html_tag_base
47
+ when 'list-group'
48
+ html_tag_base.merge("aria-controls": sanitize_text(content))
49
+ else
50
+ {}
51
+ end.merge(options[:a_html] || {})
43
52
  end
44
53
  end
45
54
  end
@@ -16,10 +16,6 @@ module UiBibz::Ui::Core::Navigations
16
16
  # You can add HTML attributes using the +html_options+.
17
17
  # You can pass arguments in options attribute:
18
18
  class NavLinkList < UiBibz::Ui::Core::Component
19
- def initialize(content = nil, options = nil, html_options = nil, &block)
20
- super
21
- end
22
-
23
19
  # Render html tag
24
20
  def pre_render
25
21
  content_tag :li, content, html_options
@@ -20,9 +20,6 @@ module UiBibz::Ui::Core::Navigations
20
20
  #
21
21
  class NavLinkSpan < UiBibz::Ui::Core::Component
22
22
  # UiBibz::Ui::Core::Component.initialize
23
- def initialize(content = nil, options = nil, html_options = nil, &block)
24
- super
25
- end
26
23
 
27
24
  # Render html tag
28
25
  def pre_render
@@ -44,7 +41,7 @@ module UiBibz::Ui::Core::Navigations
44
41
 
45
42
  def component_html_data
46
43
  super
47
- add_html_data 'link', options[:link] if options[:link]
44
+ add_html_data 'link', value: options[:link] if options[:link]
48
45
  end
49
46
  end
50
47
  end
@@ -20,9 +20,6 @@ module UiBibz::Ui::Core::Navigations
20
20
  #
21
21
  class NavText < UiBibz::Ui::Core::Component
22
22
  # UiBibz::Ui::Core::Component.initialize
23
- def initialize(content = nil, options = nil, html_options = nil, &block)
24
- super
25
- end
26
23
 
27
24
  # Render html tag
28
25
  def pre_render
@@ -17,9 +17,6 @@ module UiBibz::Ui::Core::Navigations
17
17
  # You can pass arguments in options attribute:
18
18
  class NavbarBrand < UiBibz::Ui::Core::Component
19
19
  # See UiBibz::Ui::Core::Component.initialize
20
- def initialize(content = nil, options = nil, html_options = nil, &block)
21
- super
22
- end
23
20
 
24
21
  # Render html tag
25
22
  def pre_render
@@ -53,7 +53,7 @@ module UiBibz::Ui::Core::Navigations
53
53
  @content = block
54
54
  @model_or_url = model_or_url
55
55
  @options = options
56
- @html_options = !%i[form_for ui_form_for].include?(type) ? html_options_for_form(@model_or_url, new_option) : new_option
56
+ @html_options = %i[form_for ui_form_for].exclude?(type) ? html_options_for_form(@model_or_url, new_option) : new_option
57
57
  end
58
58
 
59
59
  # Render html tag
@@ -64,8 +64,8 @@ module UiBibz::Ui::Core::Navigations
64
64
  when :ui_form_for
65
65
  begin
66
66
  @form = ui_form_for(@model_or_url, html_options, &@content)
67
- ## rescue
68
- ## raise 'You must install simple form to use ui_form_for.'
67
+ rescue e
68
+ raise 'You must install simple form to use ui_form_for.'
69
69
  end
70
70
  else
71
71
  @form = form_tag_with_body(html_options, capture(&@content))
@@ -75,7 +75,7 @@ module UiBibz::Ui::Core::Navigations
75
75
  private
76
76
 
77
77
  def new_option
78
- (@options || {}).merge({ class: UiBibz::Utils::Screwdriver.join_classes('navbar-form', 'form-inline', 'my-lg-0', 'my-2', @options[:class]) })
78
+ (@options || {}).merge({ class: UiBibz::Utils::Screwdriver.join_classes('d-flex', @options[:class]) })
79
79
  end
80
80
 
81
81
  def protect_against_forgery?
@@ -32,16 +32,13 @@ module UiBibz::Ui::Core::Navigations
32
32
  #
33
33
  # ==== Examples
34
34
  #
35
- # UiBibz::Ui::Core::Navigations::NavbarNav.new().tap do |n|
35
+ # UiBibz::Ui::Core::Navigations::NavbarNav.new.tap do |n|
36
36
  # n.link 'Test', url: '#test'
37
37
  # n.link 'Test2', url: '#test2', state: :active
38
38
  # end.render
39
39
  #
40
40
  class NavbarNav < UiBibz::Ui::Core::Navigations::Nav
41
41
  # See UiBibz::Ui::Core::Navigations::Nav.initialize
42
- def initialize(content = nil, options = nil, html_options = nil, &block)
43
- super
44
- end
45
42
 
46
43
  private
47
44
 
@@ -34,9 +34,6 @@ module UiBibz::Ui::Core::Navigations
34
34
  #
35
35
  class NavbarText < UiBibz::Ui::Core::Component
36
36
  # See UiBibz::Ui::Core::Component.initialize
37
- def initialize(content = nil, options = nil, html_options = nil, &block)
38
- super
39
- end
40
37
 
41
38
  # Render html tag
42
39
  def pre_render
@@ -39,9 +39,6 @@ module UiBibz::Ui::Core::Navigations
39
39
  #
40
40
  class PaginationLink < UiBibz::Ui::Core::Component
41
41
  # See UiBibz::Ui::Core::Component.initialize
42
- def initialize(content = nil, options = nil, html_options = nil, &block)
43
- super
44
- end
45
42
 
46
43
  # Render html tag
47
44
  def pre_render
@@ -53,7 +53,7 @@ module UiBibz::Ui::Core::Navigations
53
53
  @content = block
54
54
  @model_or_url = model_or_url
55
55
  @options = options
56
- @html_options = !%i[form_for ui_form_for].include?(type) ? html_options_for_form(@model_or_url, new_option) : new_option
56
+ @html_options = %i[form_for ui_form_for].exclude?(type) ? html_options_for_form(@model_or_url, new_option) : new_option
57
57
  end
58
58
 
59
59
  # Render html tag
@@ -64,8 +64,8 @@ module UiBibz::Ui::Core::Navigations
64
64
  when :ui_form_for
65
65
  begin
66
66
  @form = ui_form_for(@model_or_url, html_options, &@content)
67
- ## rescue
68
- ## raise 'You must install simple form to use ui_form_for.'
67
+ rescue e
68
+ raise 'You must install simple form to use ui_form_for.'
69
69
  end
70
70
  else
71
71
  @form = form_tag_with_body(html_options, capture(&@content))
@@ -41,9 +41,6 @@ module UiBibz::Ui::Core::Navigations
41
41
  #
42
42
  class Link < UiBibz::Ui::Core::Component
43
43
  # See UiBibz::Ui::Core::Component.initialize
44
- def initialize(content = nil, options = nil, html_options = nil, &block)
45
- super
46
- end
47
44
 
48
45
  # Render html tag
49
46
  def pre_render
@@ -52,7 +52,7 @@ module UiBibz::Ui::Core::Navigations
52
52
  #
53
53
  # ==== Helper
54
54
  #
55
- # nav(options = { tap: true }, html_options = {}) do |n|
55
+ # nav(options = {}, html_options = {}) do |n|
56
56
  # n.link(content, options = {}, html_options = {})
57
57
  # n.link(options = {}, html_options = {}) do
58
58
  # content
@@ -66,6 +66,8 @@ module UiBibz::Ui::Core::Navigations
66
66
  # end
67
67
  #
68
68
  class Nav < UiBibz::Ui::Core::Component
69
+ include UiBibz::Ui::Concerns::HtmlConcern
70
+
69
71
  # See UiBibz::Ui::Core::Component.initialize
70
72
  def initialize(content = nil, options = nil, html_options = nil, &block)
71
73
  super
@@ -74,18 +76,24 @@ module UiBibz::Ui::Core::Navigations
74
76
 
75
77
  # Render html tag
76
78
  def pre_render
77
- content_tag tag, @items.map(&:render).join.html_safe, html_options
79
+ content_tag htlm_tag, @items.map(&:render).join.html_safe, html_options
78
80
  end
79
81
 
80
82
  # Add nav link items
81
83
  # See UiBibz::Ui::Core::Navigations::NavLink
82
84
  def link(content = nil, options = {}, html_options = nil, &block)
83
- block_given? ? content.merge!({ nav_type: type, nav_tags: nav_tags }) : options.merge!({ nav_type: type, nav_tags: nav_tags })
85
+ if block_given?
86
+ content[:nav_type] = type
87
+ content[:nav_tags] = nav_tags
88
+ else
89
+ options[:nav_type] = type
90
+ options[:nav_tags] = nav_tags
91
+ end
84
92
  @items << NavLink.new(content, options, html_options, &block)
85
93
  end
86
94
 
87
95
  def text(content = nil, options = {}, html_options = nil, &block)
88
- block_given? ? content.merge!({ nav_type: type }) : options.merge!({ nav_type: type })
96
+ block_given? ? content[:nav_type] = type : options[:nav_type] = type
89
97
  @items << NavText.new(content, options, html_options, &block)
90
98
  end
91
99
 
@@ -108,12 +116,20 @@ module UiBibz::Ui::Core::Navigations
108
116
  protected
109
117
 
110
118
  def component_html_classes
111
- ['nav', type, position, stacked, justify, fill]
119
+ [nav_class, type, position, stacked, justify, fill]
120
+ end
121
+
122
+ def component_html_options
123
+ @options[:type] == :list ? { role: 'tablist' } : super
112
124
  end
113
125
 
114
126
  # tabs or pills
115
127
  def type
116
- "nav-#{@options[:type]}" unless @options[:type].nil?
128
+ if @options[:type] == :list
129
+ 'list-group'
130
+ else
131
+ "nav-#{@options[:type]}" unless @options[:type].nil?
132
+ end
117
133
  end
118
134
 
119
135
  def position
@@ -139,11 +155,22 @@ module UiBibz::Ui::Core::Navigations
139
155
  'flex-column' if @options[:stacked]
140
156
  end
141
157
 
142
- def tag
143
- if options[:tag]
144
- options[:tag]
158
+ def htlm_tag
159
+ options[:tag] || tag_type
160
+ end
161
+
162
+ def nav_class
163
+ 'nav' if type != 'list-group'
164
+ end
165
+
166
+ def tag_type
167
+ case type
168
+ when 'nav-links'
169
+ :nav
170
+ when 'list-group'
171
+ :div
145
172
  else
146
- type == 'nav-links' ? :nav : :ul
173
+ :ul
147
174
  end
148
175
  end
149
176
 
@@ -29,6 +29,8 @@ module UiBibz::Ui::Core::Navigations
29
29
  # * +position_type+ - Symbol
30
30
  # (+:fixed+, +:sticky+)
31
31
  # * +title+ - String
32
+ # * +container+ - Hash container options
33
+ # * +container_html+ - Hash container html options
32
34
  #
33
35
  # ==== Signatures
34
36
  #
@@ -58,8 +60,8 @@ module UiBibz::Ui::Core::Navigations
58
60
  #
59
61
  # ==== Helper
60
62
  #
61
- # ui_navbar(options = { tap: true }, html_options = {}) do |nb|
62
- # nb.nav(options = { tap: true }, html_options = {}) do |n|
63
+ # ui_navbar(options = {}, html_options = {}) do |nb|
64
+ # nb.nav(options = {}, html_options = {}) do |n|
63
65
  # n.link(content, options = {}, html_options = {})
64
66
  # n.link(options = {}, html_options = {}) do
65
67
  # content
@@ -70,6 +72,8 @@ module UiBibz::Ui::Core::Navigations
70
72
  # end
71
73
  #
72
74
  class Navbar < UiBibz::Ui::Core::Component
75
+ include UiBibz::Ui::Concerns::HtmlConcern
76
+
73
77
  # See UiBibz::Ui::Core::Component.initialize
74
78
  def initialize(content = nil, options = nil, html_options = nil, &block)
75
79
  super
@@ -79,10 +83,18 @@ module UiBibz::Ui::Core::Navigations
79
83
  # Render html tag
80
84
  def pre_render
81
85
  content_tag :nav, html_options do
82
- concat title if brand_position == :left
83
- concat navbar_toggle_button_html
84
- concat title if brand_position == :right
85
- concat body_html
86
+ UiBibz::Ui::Core::Layouts::Container.new(options[:container], options[:container_html]) do
87
+ if brand_position == :left
88
+ concat title
89
+ concat @navbar_toggle_html
90
+ end
91
+ concat navbar_toggle_button_html
92
+ if brand_position == :right
93
+ concat title
94
+ concat @navbar_toggle_html
95
+ end
96
+ concat body_html
97
+ end.render
86
98
  end
87
99
  end
88
100
 
@@ -119,6 +131,15 @@ module UiBibz::Ui::Core::Navigations
119
131
  @id ||= generate_id('navbar-id')
120
132
  end
121
133
 
134
+ def navbar_toggle_html(content = nil, &block)
135
+ @navbar_toggle_html = if !block.nil?
136
+ context = eval('self', block.binding) # rubocop:disable Style/EvalWithLocation
137
+ context.capture(&block)
138
+ else
139
+ content
140
+ end
141
+ end
142
+
122
143
  private
123
144
 
124
145
  def component_html_classes
@@ -134,7 +155,7 @@ module UiBibz::Ui::Core::Navigations
134
155
  end
135
156
 
136
157
  def body_html
137
- content_tag :div, class: 'navbar-collapse', id: id do
158
+ content_tag :div, class: 'navbar-collapse collapse', id: id do
138
159
  concat @items.map(&:render).join.html_safe
139
160
  end
140
161
  end