ui_bibz 2.5.6 → 3.0.0.alpha8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (263) 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 +92 -104
  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 -3
  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 +20 -1
  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 +4 -7
  23. data/lib/ui_bibz/inputs/ui_bibz_inputs/collection_input.rb +6 -9
  24. data/lib/ui_bibz/inputs/ui_bibz_inputs/ui_checkbox_field_input.rb +5 -1
  25. data/lib/ui_bibz/inputs/ui_bibz_inputs/ui_choice_field_input.rb +23 -0
  26. data/lib/ui_bibz/inputs/ui_bibz_inputs/ui_multi_select_field_input.rb +3 -3
  27. data/lib/ui_bibz/inputs/ui_bibz_inputs/ui_slider_field_input.rb +12 -0
  28. data/lib/ui_bibz/rails/engine.rb +1 -16
  29. data/lib/ui_bibz/railtie.rb +6 -0
  30. data/lib/ui_bibz/ui/concerns/card_itemable_concern.rb +67 -0
  31. data/lib/ui_bibz/ui/concerns/html_concern.rb +16 -0
  32. data/lib/ui_bibz/ui/core/boxes/card.rb +5 -50
  33. data/lib/ui_bibz/ui/core/boxes/card_accordion.rb +2 -0
  34. data/lib/ui_bibz/ui/core/boxes/card_column.rb +3 -1
  35. data/lib/ui_bibz/ui/core/boxes/card_deck.rb +3 -1
  36. data/lib/ui_bibz/ui/core/boxes/card_grid.rb +60 -0
  37. data/lib/ui_bibz/ui/core/boxes/card_group.rb +3 -1
  38. data/lib/ui_bibz/ui/core/boxes/components/body/card_body_link.rb +0 -3
  39. data/lib/ui_bibz/ui/core/boxes/components/body/card_body_subtitle.rb +47 -0
  40. data/lib/ui_bibz/ui/core/boxes/components/body/card_body_text.rb +0 -3
  41. data/lib/ui_bibz/ui/core/boxes/components/body/card_body_title.rb +1 -4
  42. data/lib/ui_bibz/ui/core/boxes/components/card_body.rb +15 -0
  43. data/lib/ui_bibz/ui/core/boxes/components/card_col.rb +65 -0
  44. data/lib/ui_bibz/ui/core/boxes/components/card_footer.rb +0 -3
  45. data/lib/ui_bibz/ui/core/boxes/components/card_header.rb +2 -4
  46. data/lib/ui_bibz/ui/core/boxes/components/card_image.rb +1 -4
  47. data/lib/ui_bibz/ui/core/boxes/components/card_row.rb +65 -0
  48. data/lib/ui_bibz/ui/core/boxes/components/card_tab_group.rb +0 -4
  49. data/lib/ui_bibz/ui/core/boxes/jumbotron.rb +1 -4
  50. data/lib/ui_bibz/ui/core/component.rb +16 -9
  51. data/lib/ui_bibz/ui/core/forms/buttons/button.rb +2 -2
  52. data/lib/ui_bibz/ui/core/forms/buttons/button_group.rb +9 -11
  53. data/lib/ui_bibz/ui/core/forms/buttons/button_refresh.rb +0 -3
  54. data/lib/ui_bibz/ui/core/forms/buttons/components/button_group_dropdown.rb +0 -3
  55. data/lib/ui_bibz/ui/core/forms/buttons/components/button_group_split_dropdown.rb +0 -3
  56. data/lib/ui_bibz/ui/core/forms/choices/box_switch_field.rb +7 -10
  57. data/lib/ui_bibz/ui/core/forms/choices/checkbox_field.rb +20 -10
  58. data/lib/ui_bibz/ui/core/forms/choices/choice_group.rb +22 -2
  59. data/lib/ui_bibz/ui/core/forms/choices/components/choice.rb +24 -12
  60. data/lib/ui_bibz/ui/core/forms/choices/radio_field.rb +17 -6
  61. data/lib/ui_bibz/ui/core/forms/choices/switch_field.rb +5 -5
  62. data/lib/ui_bibz/ui/core/forms/dates/date_picker_field.rb +12 -15
  63. data/lib/ui_bibz/ui/core/forms/dropdowns/components/dropdown_divider.rb +0 -1
  64. data/lib/ui_bibz/ui/core/forms/dropdowns/components/dropdown_header.rb +0 -3
  65. data/lib/ui_bibz/ui/core/forms/dropdowns/dropdown.rb +19 -20
  66. data/lib/ui_bibz/ui/core/forms/dropdowns/split_dropdown.rb +7 -5
  67. data/lib/ui_bibz/ui/core/forms/files/file_field.rb +20 -10
  68. data/lib/ui_bibz/ui/core/forms/numbers/formula_field.rb +18 -8
  69. data/lib/ui_bibz/ui/core/forms/numbers/number_field.rb +20 -3
  70. data/lib/ui_bibz/ui/core/forms/numbers/range_field.rb +51 -5
  71. data/lib/ui_bibz/ui/core/forms/numbers/slider_field.rb +144 -0
  72. data/lib/ui_bibz/ui/core/forms/numbers/slider_header.rb +71 -0
  73. data/lib/ui_bibz/ui/core/forms/selects/abstract_select.rb +0 -3
  74. data/lib/ui_bibz/ui/core/forms/selects/dropdown_select_field.rb +41 -62
  75. data/lib/ui_bibz/ui/core/forms/selects/multi_column_field.rb +0 -3
  76. data/lib/ui_bibz/ui/core/forms/selects/select_field.rb +2 -5
  77. data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_addon.rb +1 -4
  78. data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_button.rb +1 -6
  79. data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_button_group.rb +0 -3
  80. data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_button_link.rb +1 -6
  81. data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_button_refresh.rb +1 -12
  82. data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_checkbox_field.rb +9 -4
  83. data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_dropdown.rb +0 -3
  84. data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_radio_field.rb +9 -4
  85. data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_switch_field.rb +0 -3
  86. data/lib/ui_bibz/ui/core/forms/surrounds/surround_field.rb +4 -12
  87. data/lib/ui_bibz/ui/core/forms/textareas/markdown_editor_field.rb +4 -7
  88. data/lib/ui_bibz/ui/core/forms/texts/auto_complete_field.rb +2 -5
  89. data/lib/ui_bibz/ui/core/forms/texts/text_field.rb +0 -3
  90. data/lib/ui_bibz/ui/core/icons/components/glyph_counter.rb +0 -3
  91. data/lib/ui_bibz/ui/core/icons/components/glyph_text.rb +1 -4
  92. data/lib/ui_bibz/ui/core/icons/glyph.rb +1 -4
  93. data/lib/ui_bibz/ui/core/icons/star.rb +0 -3
  94. data/lib/ui_bibz/ui/core/layouts/col.rb +5 -42
  95. data/lib/ui_bibz/ui/core/layouts/container.rb +9 -6
  96. data/lib/ui_bibz/ui/core/layouts/row.rb +32 -2
  97. data/lib/ui_bibz/ui/core/lists/components/list.rb +6 -8
  98. data/lib/ui_bibz/ui/core/lists/components/list/list_body.rb +0 -3
  99. data/lib/ui_bibz/ui/core/lists/components/list/list_header.rb +0 -3
  100. data/lib/ui_bibz/ui/core/lists/list_group.rb +9 -6
  101. data/lib/ui_bibz/ui/core/navigations/breadcrumb.rb +3 -2
  102. data/lib/ui_bibz/ui/core/navigations/components/breadcrumb_link.rb +0 -3
  103. data/lib/ui_bibz/ui/core/navigations/components/nav_dropdown.rb +2 -5
  104. data/lib/ui_bibz/ui/core/navigations/components/nav_link.rb +3 -1
  105. data/lib/ui_bibz/ui/core/navigations/components/nav_link_link.rb +15 -6
  106. data/lib/ui_bibz/ui/core/navigations/components/nav_link_list.rb +0 -4
  107. data/lib/ui_bibz/ui/core/navigations/components/nav_link_span.rb +1 -4
  108. data/lib/ui_bibz/ui/core/navigations/components/nav_text.rb +0 -3
  109. data/lib/ui_bibz/ui/core/navigations/components/navbar_brand.rb +0 -3
  110. data/lib/ui_bibz/ui/core/navigations/components/navbar_form.rb +4 -4
  111. data/lib/ui_bibz/ui/core/navigations/components/navbar_nav.rb +1 -4
  112. data/lib/ui_bibz/ui/core/navigations/components/navbar_text.rb +0 -3
  113. data/lib/ui_bibz/ui/core/navigations/components/pagination_link.rb +0 -3
  114. data/lib/ui_bibz/ui/core/navigations/components/toolbar_form.rb +3 -3
  115. data/lib/ui_bibz/ui/core/navigations/link.rb +0 -3
  116. data/lib/ui_bibz/ui/core/navigations/nav.rb +37 -10
  117. data/lib/ui_bibz/ui/core/navigations/navbar.rb +31 -8
  118. data/lib/ui_bibz/ui/core/navigations/pagination.rb +3 -1
  119. data/lib/ui_bibz/ui/core/navigations/tab_group.rb +10 -5
  120. data/lib/ui_bibz/ui/core/navigations/toolbar.rb +2 -0
  121. data/lib/ui_bibz/ui/core/notifications/alert.rb +2 -2
  122. data/lib/ui_bibz/ui/core/notifications/badge.rb +2 -5
  123. data/lib/ui_bibz/ui/core/notifications/components/alert_body.rb +0 -3
  124. data/lib/ui_bibz/ui/core/notifications/components/alert_header.rb +4 -10
  125. data/lib/ui_bibz/ui/core/notifications/components/bar.rb +0 -3
  126. data/lib/ui_bibz/ui/core/notifications/components/toast_body.rb +0 -3
  127. data/lib/ui_bibz/ui/core/notifications/components/toast_header.rb +1 -6
  128. data/lib/ui_bibz/ui/core/notifications/progress_bar.rb +7 -5
  129. data/lib/ui_bibz/ui/core/notifications/spinner.rb +0 -3
  130. data/lib/ui_bibz/ui/core/notifications/toast.rb +14 -3
  131. data/lib/ui_bibz/ui/core/windows/components/modal_body.rb +0 -3
  132. data/lib/ui_bibz/ui/core/windows/components/modal_footer.rb +0 -3
  133. data/lib/ui_bibz/ui/core/windows/components/modal_header.rb +1 -7
  134. data/lib/ui_bibz/ui/core/windows/modal.rb +65 -14
  135. data/lib/ui_bibz/ui/extensions/core/component/glyph_extension.rb +6 -2
  136. data/lib/ui_bibz/ui/extensions/core/component/popover_extension.rb +9 -9
  137. data/lib/ui_bibz/ui/extensions/core/forms/connect_extension.rb +2 -2
  138. data/lib/ui_bibz/ui/extensions/core/forms/surround_extension.rb +1 -1
  139. data/lib/ui_bibz/ui/ux/containers/components/panel_body.rb +0 -3
  140. data/lib/ui_bibz/ui/ux/containers/components/panel_column.rb +2 -0
  141. data/lib/ui_bibz/ui/ux/containers/components/panel_deck.rb +2 -0
  142. data/lib/ui_bibz/ui/ux/containers/components/panel_footer.rb +0 -3
  143. data/lib/ui_bibz/ui/ux/containers/components/panel_group.rb +2 -0
  144. data/lib/ui_bibz/ui/ux/containers/components/panel_header.rb +4 -6
  145. data/lib/ui_bibz/ui/ux/containers/components/panel_header_title.rb +47 -0
  146. data/lib/ui_bibz/ui/ux/containers/components/panel_tab_group.rb +0 -4
  147. data/lib/ui_bibz/ui/ux/containers/components/panel_toolbar.rb +0 -3
  148. data/lib/ui_bibz/ui/ux/containers/panel.rb +4 -2
  149. data/lib/ui_bibz/ui/ux/tables/components/thead.rb +0 -3
  150. data/lib/ui_bibz/ui/ux/tables/table.rb +2 -4
  151. data/lib/ui_bibz/ui/ux/tables/table_card.rb +4 -3
  152. data/lib/ui_bibz/ui/ux/tables/table_pagination_per_page.rb +3 -3
  153. data/lib/ui_bibz/ui/ux/tables/table_search_field.rb +8 -8
  154. data/lib/ui_bibz/utils/breakdown_class_name_generator.rb +82 -0
  155. data/lib/ui_bibz/utils/internationalization.rb +2 -2
  156. data/lib/ui_bibz/utils/screwdriver.rb +16 -10
  157. data/test/dummy/Rakefile +1 -1
  158. data/test/dummy/app/javascripts/packs/index.js +3 -0
  159. data/test/dummy/app/views/layouts/application.html.erb +4 -1
  160. data/{app/ui/.keep → test/dummy/app/views/users/index.html.erb} +0 -0
  161. data/test/dummy/bin/setup +17 -13
  162. data/test/dummy/config.ru +2 -1
  163. data/test/dummy/config/application.rb +1 -0
  164. data/test/dummy/config/cable.yml +10 -0
  165. data/test/dummy/config/database.yml +1 -1
  166. data/test/dummy/config/environment.rb +1 -1
  167. data/test/dummy/config/environments/development.rb +33 -12
  168. data/test/dummy/config/environments/production.rb +52 -19
  169. data/test/dummy/config/environments/test.rb +18 -12
  170. data/test/dummy/config/initializers/application_controller_renderer.rb +9 -0
  171. data/test/dummy/config/initializers/assets.rb +4 -3
  172. data/test/dummy/config/initializers/backtrace_silencers.rb +0 -1
  173. data/test/dummy/config/initializers/content_security_policy.rb +29 -0
  174. data/test/dummy/config/initializers/cookies_serializer.rb +2 -0
  175. data/test/dummy/config/initializers/inflections.rb +0 -1
  176. data/test/dummy/config/initializers/mime_types.rb +0 -1
  177. data/test/dummy/config/initializers/wrap_parameters.rb +2 -2
  178. data/test/dummy/config/puma.rb +40 -0
  179. data/test/dummy/config/routes.rb +3 -0
  180. data/test/dummy/config/spring.rb +8 -0
  181. data/test/dummy/config/storage.yml +34 -0
  182. data/test/dummy/db/migrate/20150123191805_create_users.rb +1 -1
  183. data/test/dummy/db/schema.rb +24 -24
  184. data/test/dummy/public/404.html +6 -6
  185. data/test/dummy/public/422.html +6 -6
  186. data/test/dummy/public/500.html +6 -6
  187. data/test/dummy/public/apple-touch-icon-precomposed.png +0 -0
  188. data/test/dummy/public/apple-touch-icon.png +0 -0
  189. data/test/dummy/storage/.keep +0 -0
  190. data/test/simple_form_test.rb +45 -44
  191. data/test/store_test.rb +5 -5
  192. data/test/test_helper.rb +18 -9
  193. data/test/ui/core/boxes/card_grid_test.rb +17 -0
  194. data/test/ui/core/boxes/card_test.rb +46 -12
  195. data/test/ui/core/boxes/jumbotron_test.rb +2 -2
  196. data/test/ui/core/component_test.rb +1 -1
  197. data/test/ui/core/forms/buttons/button_group_test.rb +1 -1
  198. data/test/ui/core/forms/buttons/button_link_test.rb +1 -1
  199. data/test/ui/core/forms/buttons/button_test.rb +2 -2
  200. data/test/ui/core/forms/choices/checkbox_field_test.rb +9 -2
  201. data/test/ui/core/forms/choices/choice_group_test.rb +11 -9
  202. data/test/ui/core/forms/choices/radio_field_test.rb +1 -1
  203. data/test/ui/core/forms/dates/date_picker_field_test.rb +1 -1
  204. data/test/ui/core/forms/dropdowns/dropdown_test.rb +2 -2
  205. data/test/ui/core/forms/files/file_field_test.rb +12 -0
  206. data/test/ui/core/forms/numbers/formula_field_test.rb +1 -1
  207. data/test/ui/core/forms/numbers/range_field_test.rb +37 -2
  208. data/test/ui/core/forms/numbers/slider_field_test.rb +26 -0
  209. data/test/ui/core/forms/selects/multi_column_field_test.rb +1 -1
  210. data/test/ui/core/forms/selects/multi_select_field_test.rb +7 -7
  211. data/test/ui/core/forms/selects/select_field_test.rb +3 -3
  212. data/test/ui/core/forms/surrounds/surround_field_test.rb +40 -4
  213. data/test/ui/core/forms/textareas/markdown_editor_field_test.rb +1 -1
  214. data/test/ui/core/forms/texts/auto_complete_field_test.rb +8 -8
  215. data/test/ui/core/forms/texts/text_field_test.rb +2 -2
  216. data/test/ui/core/layouts/col_test.rb +11 -2
  217. data/test/ui/core/layouts/container_test.rb +15 -1
  218. data/test/ui/core/layouts/row_test.rb +68 -3
  219. data/test/ui/core/lists/list_group_test.rb +1 -1
  220. data/test/ui/core/navigations/breadcrumb_test.rb +1 -1
  221. data/test/ui/core/navigations/link_test.rb +1 -1
  222. data/test/ui/core/navigations/nav_test.rb +17 -5
  223. data/test/ui/core/navigations/navbar_test.rb +7 -8
  224. data/test/ui/core/navigations/tab_group_test.rb +4 -4
  225. data/test/ui/core/notifications/alert_test.rb +2 -2
  226. data/test/ui/core/notifications/badge_test.rb +3 -3
  227. data/test/ui/core/notifications/progress_bar_test.rb +1 -1
  228. data/test/ui/core/notifications/toast_test.rb +10 -1
  229. data/test/ui/core/windows/modal_test.rb +15 -1
  230. data/test/ui/utils/breakdown_class_name_generator_test.rb +74 -0
  231. data/test/ui/ux/containers/panel_test.rb +5 -5
  232. data/test/ui/ux/tables/table_test.rb +6 -6
  233. data/test/ui_bibz_test.rb +1 -1
  234. data/ui_bibz.gemspec +16 -16
  235. metadata +100 -108
  236. data/app/assets/javascripts/fix_bootstrap.coffee +0 -7
  237. data/app/assets/javascripts/form.coffee +0 -83
  238. data/app/assets/javascripts/formula.coffee +0 -69
  239. data/app/assets/javascripts/input-connected.coffee +0 -101
  240. data/app/assets/javascripts/interface.coffee +0 -55
  241. data/app/assets/javascripts/jquery.multi-select-extend.coffee +0 -38
  242. data/app/assets/javascripts/table.coffee +0 -36
  243. data/app/assets/javascripts/ui_bibz.coffee.erb +0 -75
  244. data/app/assets/stylesheets/_custom_variables.sass +0 -20
  245. data/app/assets/stylesheets/_panel.scss +0 -315
  246. data/app/assets/stylesheets/bootstrap-switch.sass +0 -159
  247. data/app/assets/stylesheets/boxes.sass +0 -5
  248. data/app/assets/stylesheets/containers.sass +0 -2
  249. data/app/assets/stylesheets/fix-bootstrap-4.sass +0 -19
  250. data/app/assets/stylesheets/fix_addon.sass +0 -216
  251. data/app/assets/stylesheets/forms.sass +0 -91
  252. data/app/assets/stylesheets/navigations.sass +0 -17
  253. data/app/assets/stylesheets/notifications.sass +0 -42
  254. data/app/assets/stylesheets/tables.sass +0 -66
  255. data/app/assets/stylesheets/ui_bibz.sass.erb +0 -55
  256. data/lib/generators/ui_bibz/install_generator.rb +0 -17
  257. data/lib/generators/ui_bibz/templates/ui_bibz_initializer.rb +0 -5
  258. data/lib/ui_bibz/ui/core/forms/selects/multi_select_field.rb +0 -125
  259. data/lib/ui_bibz/ui/core/icons/glyph_group.rb +0 -101
  260. data/test/dummy/bin/bundle +0 -5
  261. data/test/ui/core/forms/files/text_field_test.rb +0 -12
  262. data/test/ui/core/forms/selects/dropdown_select_field_test.rb +0 -84
  263. data/test/ui/core/icons/glyph_group_test.rb +0 -37
@@ -51,7 +51,7 @@ module UiBibz::Ui::Core::Notifications
51
51
  # See UiBibz::Ui::Core::Component.initialize
52
52
  def initialize(content = nil, options = nil, html_options = nil, &block)
53
53
  super
54
- header(@content) if @options[:tap].nil?
54
+ header(@content, tap: false) unless @tapped
55
55
  end
56
56
 
57
57
  # Render html tag
@@ -82,7 +82,7 @@ module UiBibz::Ui::Core::Notifications
82
82
 
83
83
  def component_html_data
84
84
  super
85
- add_html_data 'timeout', options[:timeout] if options[:timeout]
85
+ add_html_data 'timeout', value: options[:timeout] if options[:timeout]
86
86
  end
87
87
 
88
88
  def component_html_classes
@@ -49,9 +49,6 @@ module UiBibz::Ui::Core::Notifications
49
49
  #
50
50
  class Badge < UiBibz::Ui::Core::Component
51
51
  # See UiBibz::Ui::Core::Component.initialize
52
- def initialize(content = nil, options = nil, html_options = nil, &block)
53
- super
54
- end
55
52
 
56
53
  # Render html tag
57
54
  def pre_render
@@ -69,11 +66,11 @@ module UiBibz::Ui::Core::Notifications
69
66
  end
70
67
 
71
68
  def status
72
- "badge-#{@options[:status] || :default}"
69
+ "bg-#{@options[:status] || :default}"
73
70
  end
74
71
 
75
72
  def type
76
- 'badge-pill' if @options[:type] == :pill
73
+ 'rounded-pill' if @options[:type] == :pill
77
74
  end
78
75
  end
79
76
  end
@@ -32,9 +32,6 @@ module UiBibz::Ui::Core::Notifications::Components
32
32
  #
33
33
  class AlertBody < UiBibz::Ui::Core::Component
34
34
  # See UiBibz::Ui::Core::Component.initialize
35
- def initialize(content = nil, options = nil, html_options = nil, &block)
36
- super
37
- end
38
35
 
39
36
  def pre_render
40
37
  tag(:hr) + content_tag(:p, content, html_options)
@@ -32,15 +32,12 @@ module UiBibz::Ui::Core::Notifications::Components
32
32
  #
33
33
  class AlertHeader < UiBibz::Ui::Core::Component
34
34
  # See UiBibz::Ui::Core::Component.initialize
35
- def initialize(content = nil, options = nil, html_options = nil, &block)
36
- super
37
- end
38
35
 
39
36
  def pre_render
40
- if options[:tap]
41
- content_tag :h4, html_content, html_options
42
- else
37
+ if options[:tap] == false
43
38
  html_content
39
+ else
40
+ content_tag :h4, html_content, html_options
44
41
  end
45
42
  end
46
43
 
@@ -57,10 +54,7 @@ module UiBibz::Ui::Core::Notifications::Components
57
54
  end
58
55
 
59
56
  def close_html
60
- content_tag :button, type: 'button', class: 'close', 'data-dismiss' => 'alert', 'aria-label' => 'Close' do
61
- concat content_tag :span, '×', 'aria-hidden' => true
62
- concat content_tag :span, 'Close', class: 'sr-only'
63
- end
57
+ content_tag :button, '', type: 'button', class: 'btn-close', 'data-dismiss' => 'alert', 'aria-label' => 'Close'
64
58
  end
65
59
  end
66
60
  end
@@ -43,9 +43,6 @@ module UiBibz::Ui::Core::Notifications::Components
43
43
  #
44
44
  class Bar < UiBibz::Ui::Core::Component
45
45
  # See UiBibz::Ui::Core::Component.initialize
46
- def initialize(content = nil, options = nil, html_options = nil, &block)
47
- super
48
- end
49
46
 
50
47
  # Render html tag
51
48
  def pre_render
@@ -32,9 +32,6 @@ module UiBibz::Ui::Core::Notifications::Components
32
32
  #
33
33
  class ToastBody < UiBibz::Ui::Core::Component
34
34
  # See UiBibz::Ui::Core::Component.initialize
35
- def initialize(content = nil, options = nil, html_options = nil, &block)
36
- super
37
- end
38
35
 
39
36
  def pre_render
40
37
  content_tag :div, content, html_options
@@ -32,9 +32,6 @@ module UiBibz::Ui::Core::Notifications::Components
32
32
  #
33
33
  class ToastHeader < UiBibz::Ui::Core::Component
34
34
  # See UiBibz::Ui::Core::Component.initialize
35
- def initialize(content = nil, options = nil, html_options = nil, &block)
36
- super
37
- end
38
35
 
39
36
  def pre_render
40
37
  content_tag :div, html_options do
@@ -49,9 +46,7 @@ module UiBibz::Ui::Core::Notifications::Components
49
46
  private
50
47
 
51
48
  def close_button
52
- content_tag :button, class: 'ml-2 mb-1 close', "data-dismiss": 'toast', "aria-label": 'Close' do
53
- content_tag(:span, '×', "aria-hidden": true).html_safe
54
- end
49
+ content_tag :button, '', class: 'ml-2 mb-1 btn-close', "data-dismiss": 'toast', "aria-label": 'Close'
55
50
  end
56
51
 
57
52
  def component_html_classes
@@ -47,7 +47,7 @@ module UiBibz::Ui::Core::Notifications
47
47
  #
48
48
  # ui_progress_bar(integer, options = {}, html_options = {})
49
49
  #
50
- # ui_progress_bar(options = { tap: true }, html_options = {}) do |pb|
50
+ # ui_progress_bar(options = {}, html_options = {}) do |pb|
51
51
  # pb.bar(integer, options = {}, html_options = {})
52
52
  # pb.bar(options = {}, html_options = {}) do
53
53
  # integer
@@ -55,10 +55,12 @@ module UiBibz::Ui::Core::Notifications
55
55
  # end
56
56
  #
57
57
  class ProgressBar < UiBibz::Ui::Core::Component
58
+ include UiBibz::Ui::Concerns::HtmlConcern
59
+
58
60
  # See UiBibz::Ui::Core::Component.initialize
59
61
  def initialize(content = nil, options = nil, html_options = nil, &block)
60
62
  super
61
- @bars = []
63
+ @items = []
62
64
  end
63
65
 
64
66
  # Render html tag
@@ -67,7 +69,7 @@ module UiBibz::Ui::Core::Notifications
67
69
  end
68
70
 
69
71
  def bar(content = nil, options = nil, html_options = nil, &block)
70
- @bars << UiBibz::Ui::Core::Notifications::Components::Bar.new(content, options, html_options, &block).render
72
+ @items << UiBibz::Ui::Core::Notifications::Components::Bar.new(content, options, html_options, &block).render
71
73
  end
72
74
 
73
75
  private
@@ -77,8 +79,8 @@ module UiBibz::Ui::Core::Notifications
77
79
  end
78
80
 
79
81
  def bars
80
- if !@bars.empty?
81
- @bars
82
+ if !@items.empty?
83
+ @items
82
84
  elsif options[:stacked]
83
85
  stacked_bars
84
86
  else
@@ -48,9 +48,6 @@ module UiBibz::Ui::Core::Notifications
48
48
  #
49
49
  class Spinner < UiBibz::Ui::Core::Component
50
50
  # See UiBibz::Ui::Core::Component.initialize
51
- def initialize(content = nil, options = nil, html_options = nil, &block)
52
- super
53
- end
54
51
 
55
52
  # Render html tag
56
53
  def pre_render
@@ -49,7 +49,7 @@ module UiBibz::Ui::Core::Notifications
49
49
  #
50
50
  # ==== Helper
51
51
  #
52
- # ui_toast(options = { tap: true }, html_options = {}) do |t|
52
+ # ui_toast(options = {}, html_options = {}) do |t|
53
53
  # t.header "My header toast", glyph: 'eye', time: 'now'
54
54
  # t.body "My body toast"
55
55
  # end
@@ -58,6 +58,7 @@ module UiBibz::Ui::Core::Notifications
58
58
  # See UiBibz::Ui::Core::Component.initialize
59
59
  def initialize(content = nil, options = nil, html_options = nil, &block)
60
60
  super
61
+ body(@content) unless @tapped
61
62
  end
62
63
 
63
64
  # Render html tag
@@ -81,7 +82,7 @@ module UiBibz::Ui::Core::Notifications
81
82
  private
82
83
 
83
84
  def component_html_classes
84
- super << 'toast'
85
+ super << ['toast', status, white_text_color]
85
86
  end
86
87
 
87
88
  def component_html_options
@@ -90,7 +91,17 @@ module UiBibz::Ui::Core::Notifications
90
91
 
91
92
  def component_html_data
92
93
  super
93
- add_html_data 'autohide', options[:auto_hide] if options[:auto_hide]
94
+ add_html_data 'autohide', value: options[:auto_hide] if options[:auto_hide]
95
+ end
96
+
97
+ def status
98
+ "bg-#{options[:status]}" if options[:status]
99
+ end
100
+
101
+ def white_text_color
102
+ return if options[:status].nil?
103
+
104
+ 'text-white' unless %i[info warning info light].include?(options[:status])
94
105
  end
95
106
  end
96
107
  end
@@ -32,9 +32,6 @@ module UiBibz::Ui::Core::Windows::Components
32
32
  #
33
33
  class ModalBody < UiBibz::Ui::Core::Component
34
34
  # See UiBibz::Ui::Core::Component.initialize
35
- def initialize(content = nil, options = nil, html_options = nil, &block)
36
- super
37
- end
38
35
 
39
36
  # Render html tag
40
37
  def pre_render
@@ -32,9 +32,6 @@ module UiBibz::Ui::Core::Windows::Components
32
32
  #
33
33
  class ModalFooter < UiBibz::Ui::Core::Component
34
34
  # See UiBibz::Ui::Core::Component.initialize
35
- def initialize(content = nil, options = nil, html_options = nil, &block)
36
- super
37
- end
38
35
 
39
36
  # Render html tag
40
37
  def pre_render
@@ -32,9 +32,6 @@ module UiBibz::Ui::Core::Windows::Components
32
32
  #
33
33
  class ModalHeader < UiBibz::Ui::Core::Component
34
34
  # See UiBibz::Ui::Core::Component.initialize
35
- def initialize(content = nil, options = nil, html_options = nil, &block)
36
- super
37
- end
38
35
 
39
36
  # Render html tag
40
37
  def pre_render
@@ -51,10 +48,7 @@ module UiBibz::Ui::Core::Windows::Components
51
48
  end
52
49
 
53
50
  def close_button_html
54
- content_tag :button, class: 'close', 'data-dismiss' => 'modal', 'aria-label' => 'Close' do
55
- concat content_tag :span, '×', 'aria-hidden' => true
56
- concat content_tag :span, 'Close', class: 'sr-only'
57
- end
51
+ content_tag :button, '', class: 'btn-close', 'data-dismiss' => 'modal', 'aria-label' => 'Close'
58
52
  end
59
53
  end
60
54
  end
@@ -19,7 +19,11 @@ module UiBibz::Ui::Core::Windows
19
19
  # You can add HTML attributes using the +html_options+.
20
20
  # You can pass arguments in options attribute:
21
21
  # * +size+
22
- # (+:sm+, +:lg+)
22
+ # (+:xl:,+:lg+, +:md+, +:sm+)
23
+ # * +fullscreen+ - Boolean
24
+ # * +backdrop+ - Symbol (+:static+)
25
+ # * +scrollable+ - Boolean
26
+ # * +position+ - Symbol (+:centered+)
23
27
  #
24
28
  # ==== Signatures
25
29
  #
@@ -55,48 +59,95 @@ module UiBibz::Ui::Core::Windows
55
59
  #
56
60
  class Modal < UiBibz::Ui::Core::Component
57
61
  # See UiBibz::Ui::Core::Component.initialize
58
- def initialize(content = nil, options = nil, html_options = nil, &block)
59
- super
60
- end
61
62
 
62
63
  # Render html tag
63
64
  def pre_render
64
- content_tag :div, html_options do
65
- content_tag :div, class: "modal-dialog #{size}", role: 'document' do
65
+ content_tag :div, modal_html_options do
66
+ content_tag :div, class: modal_dialog_classes do
66
67
  content_tag :div, class: 'modal-content' do
67
- concat @header
68
- concat @body
69
- concat @footer
68
+ concat @header&.render
69
+ concat @body&.render
70
+ concat @footer&.render
70
71
  end
71
72
  end
72
73
  end
73
74
  end
74
75
 
75
76
  def header(content = nil, options = nil, html_options = nil, &block)
76
- @header = UiBibz::Ui::Core::Windows::Components::ModalHeader.new(content, options, html_options, &block).render
77
+ @header = UiBibz::Ui::Core::Windows::Components::ModalHeader.new(content, options, html_options, &block)
77
78
  end
78
79
 
79
80
  def footer(content = nil, options = nil, html_options = nil, &block)
80
- @footer = UiBibz::Ui::Core::Windows::Components::ModalFooter.new(content, options, html_options, &block).render
81
+ @footer = UiBibz::Ui::Core::Windows::Components::ModalFooter.new(content, options, html_options, &block)
81
82
  end
82
83
 
83
84
  def body(content = nil, options = nil, html_options = nil, &block)
84
- @body = UiBibz::Ui::Core::Windows::Components::ModalBody.new(content, options, html_options, &block).render
85
+ @body = UiBibz::Ui::Core::Windows::Components::ModalBody.new(content, options, html_options, &block)
85
86
  end
86
87
 
87
88
  private
88
89
 
90
+ def modal_dialog_classes
91
+ UiBibz::Utils::Screwdriver.join_classes('modal-dialog', fullscreen_size, size, position, scrollable)
92
+ end
93
+
89
94
  def component_html_classes
90
95
  'modal'
91
96
  end
92
97
 
93
- # :lg, :sm or :xs
98
+ def scrollable
99
+ 'modal-dialog-scrollable' if @options[:scrollable]
100
+ end
101
+
102
+ # centered
103
+ def position
104
+ "modal-dialog-#{@options[:position]}" if @options[:position]
105
+ end
106
+
107
+ # :xl, :lg, :sm or :xs
108
+ def fullscreen_size
109
+ [modal, fullscreen, @options[:size], down].compact.join('-')
110
+ end
111
+
94
112
  def size
95
- "modal-#{@options[:size]}" if @options[:size]
113
+ [modal, @options[:size]].compact.join('-') if @options[:size]
114
+ end
115
+
116
+ def fullscreen
117
+ 'fullscreen' if @options[:fullscreen]
96
118
  end
97
119
 
98
120
  def effect
99
121
  @options[:effect] unless @options[:effect].nil?
100
122
  end
123
+
124
+ def down
125
+ 'down' if @options[:size] && @options[:fullscreen]
126
+ end
127
+
128
+ def modal
129
+ 'modal' if @options[:size] || @options[:fullscreen]
130
+ end
131
+
132
+ # Update html_options only during pre-render
133
+ def modal_html_options
134
+ html_options.merge({ tabindex: '-1', aria: { labelledby: labelled_by, hidden: 'true' } })
135
+ end
136
+
137
+ def component_html_data
138
+ super
139
+ backdrop
140
+ end
141
+
142
+ def labelled_by
143
+ sanitize_text(@header&.content || 'Modal')
144
+ end
145
+
146
+ def backdrop
147
+ return unless @options[:backdrop]
148
+
149
+ add_html_data 'backdrop', value: @options[:backdrop]
150
+ add_html_data 'keyboard', value: 'false'
151
+ end
101
152
  end
102
153
  end
@@ -13,7 +13,11 @@ module GlyphExtension
13
13
  # Render glyph with space html
14
14
  def glyph_with_space
15
15
  out = [glyph]
16
- out << ' ' if options[:text] != false
16
+ out << if options[:text] == false
17
+ content_tag(:span, ' ', class: 'empty-space')
18
+ else
19
+ ' '
20
+ end
17
21
  out.join unless glyph.nil?
18
22
  end
19
23
 
@@ -23,7 +27,7 @@ module GlyphExtension
23
27
 
24
28
  glyph_options = if options[:glyph].is_a?(Hash)
25
29
  options[:glyph]
26
- elsif options[:glyph].is_a?(String)
30
+ elsif options[:glyph]
27
31
  { name: options[:glyph] }
28
32
  else
29
33
  {}
@@ -8,27 +8,27 @@ module PopoverExtension
8
8
  trigger offset fallback_placement boundary sanitize white_list sanitize_fn].freeze
9
9
 
10
10
  def popover_data_html
11
- unless options[:popover].blank?
12
- add_html_data :toggle, 'popover'
13
- add_html_data :content, (options[:popover].is_a?(String) ? options[:popover] : options[:popover][:content])
11
+ if options[:popover].present?
12
+ add_html_data :toggle, value: 'popover'
13
+ add_html_data :content, value: (options[:popover].is_a?(String) ? options[:popover] : options[:popover][:content])
14
14
  end
15
15
 
16
16
  return unless options[:popover].is_a?(Hash)
17
17
 
18
- POPOVER_METHODS.each { |mth| add_html_data(mth, options[:popover].try(:[], mth)) unless options[:popover].try(:[], mth).nil? }
19
- add_html_data :placement, options[:popover].try(:[], :position) unless options[:popover].try(:[], :position).nil?
18
+ POPOVER_METHODS.each { |mth| add_html_data(mth, value: options[:popover].try(:[], mth)) unless options[:popover].try(:[], mth).nil? }
19
+ add_html_data :placement, value: options[:popover].try(:[], :position) unless options[:popover].try(:[], :position).nil?
20
20
  end
21
21
 
22
22
  def tooltip_data_html
23
23
  return if options[:tooltip].nil?
24
24
 
25
- add_html_data :toggle, 'tooltip'
25
+ add_html_data :toggle, value: 'tooltip'
26
26
 
27
27
  if options[:tooltip].is_a?(Hash)
28
- TOOLTIP_METHODS.each { |mth| add_html_data(mth, options[:tooltip].try(:[], mth)) unless options[:tooltip].try(:[], mth).nil? }
29
- add_html_data :placement, options[:tooltip].try(:[], :position) unless options[:tooltip].try(:[], :position).nil?
28
+ TOOLTIP_METHODS.each { |mth| add_html_data(mth, value: options[:tooltip].try(:[], mth)) unless options[:tooltip].try(:[], mth).nil? }
29
+ add_html_data :placement, value: options[:tooltip].try(:[], :position) unless options[:tooltip].try(:[], :position).nil?
30
30
  else
31
- add_html_data :title, options[:tooltip]
31
+ add_html_data :title, value: options[:tooltip]
32
32
  end
33
33
  end
34
34
  end