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
@@ -45,7 +45,7 @@ module UiBibz::Ui::Core::Navigations
45
45
  #
46
46
  # ==== Helper
47
47
  #
48
- # ui_pagination(options = { tap: true }, html_options = {}) do |n|
48
+ # ui_pagination(options = {}, html_options = {}) do |n|
49
49
  # n.link(content, options = {}, html_options = {})
50
50
  # n.link(options = {}, html_options = {}) do
51
51
  # content
@@ -53,6 +53,8 @@ module UiBibz::Ui::Core::Navigations
53
53
  # end
54
54
  #
55
55
  class Pagination < UiBibz::Ui::Core::Component
56
+ include UiBibz::Ui::Concerns::HtmlConcern
57
+
56
58
  # See UiBibz::Ui::Core::Component.initialize
57
59
  def initialize(content = nil, options = nil, html_options = nil, &block)
58
60
  super
@@ -46,7 +46,7 @@ module UiBibz::Ui::Core::Navigations
46
46
  #
47
47
  # ==== Helper
48
48
  #
49
- # ui_tab_group(options = { tap: true }, html_options = {}) do |n|
49
+ # ui_tab_group(options = {}, html_options = {}) do |n|
50
50
  # n.tab(content, options = {}, html_options = {})
51
51
  # n.tab(options = {}, html_options = {}) do
52
52
  # content
@@ -60,15 +60,20 @@ module UiBibz::Ui::Core::Navigations
60
60
  # end
61
61
  #
62
62
  class TabGroup < UiBibz::Ui::Core::Navigations::Nav
63
+ include UiBibz::Ui::Concerns::HtmlConcern
64
+
63
65
  # See UiBibz::Ui::Core::Component.initialize
64
- def initialize(content = nil, options = nil, html_options = nil, &block)
65
- super
66
- end
67
66
 
68
67
  # Add nav link items
69
68
  # See UiBibz::Ui::Core::Navigations::NavLink
70
69
  def tab(content = nil, options = {}, html_options = nil, &block)
71
- block_given? ? content.merge!({ nav_type: type, tag_type: @options[:tag_type] }) : options.merge!({ nav_type: type, tag_type: @options[:tag_type] })
70
+ if block_given?
71
+ content[:nav_type] = type
72
+ content[:tag_type] = @options[:tag_type]
73
+ else
74
+ options[:nav_type] = type
75
+ options[:tag_type] = @options[:tag_type]
76
+ end
72
77
  @items << NavLink.new(content, options, html_options, &block)
73
78
  end
74
79
 
@@ -52,6 +52,8 @@ module UiBibz::Ui::Core::Navigations
52
52
  # end
53
53
  #
54
54
  class Toolbar < UiBibz::Ui::Core::Component
55
+ include UiBibz::Ui::Concerns::HtmlConcern
56
+
55
57
  # See UiBibz::Ui::Core::Component.initialize
56
58
  def initialize(content = nil, options = nil, html_options = nil, &block)
57
59
  super
@@ -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,91 @@ 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', 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
94
108
  def size
95
- "modal-#{@options[:size]}" if @options[:size]
109
+ [modal, fullscreen, @options[:size], down].compact.join('-')
110
+ end
111
+
112
+ def fullscreen
113
+ 'fullscreen' if @options[:fullscreen]
96
114
  end
97
115
 
98
116
  def effect
99
117
  @options[:effect] unless @options[:effect].nil?
100
118
  end
119
+
120
+ def down
121
+ 'down' if @options[:size] && @options[:fullscreen]
122
+ end
123
+
124
+ def modal
125
+ 'modal' if @options[:size] || @options[:fullscreen]
126
+ end
127
+
128
+ # Update html_options only during pre-render
129
+ def modal_html_options
130
+ html_options.merge({ tabindex: '-1', aria: { labelledby: labelled_by, hidden: 'true' } })
131
+ end
132
+
133
+ def component_html_data
134
+ super
135
+ backdrop
136
+ end
137
+
138
+ def labelled_by
139
+ sanitize_text(@header&.content || 'Modal')
140
+ end
141
+
142
+ def backdrop
143
+ return unless @options[:backdrop]
144
+
145
+ add_html_data 'backdrop', value: @options[:backdrop]
146
+ add_html_data 'keyboard', value: 'false'
147
+ end
101
148
  end
102
149
  end