Skip to content

Commit

Permalink
[...work in progress...]
Browse files Browse the repository at this point in the history
  • Loading branch information
thooams committed Dec 2, 2024
1 parent 1be2ca9 commit d60c15e
Show file tree
Hide file tree
Showing 22 changed files with 7,940 additions and 69 deletions.
125 changes: 63 additions & 62 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
ui_bibz (4.0.0.beta14)
ui_bibz (4.0.0.beta15)
bootstrap-propshaft (~> 5.3.2.2)
dartsass-rails
rails (>= 7.1.0)
Expand All @@ -10,66 +10,65 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actioncable (7.2.2)
actionpack (= 7.2.2)
activesupport (= 7.2.2)
actioncable (8.0.0)
actionpack (= 8.0.0)
activesupport (= 8.0.0)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.2.2)
actionpack (= 7.2.2)
activejob (= 7.2.2)
activerecord (= 7.2.2)
activestorage (= 7.2.2)
activesupport (= 7.2.2)
actionmailbox (8.0.0)
actionpack (= 8.0.0)
activejob (= 8.0.0)
activerecord (= 8.0.0)
activestorage (= 8.0.0)
activesupport (= 8.0.0)
mail (>= 2.8.0)
actionmailer (7.2.2)
actionpack (= 7.2.2)
actionview (= 7.2.2)
activejob (= 7.2.2)
activesupport (= 7.2.2)
actionmailer (8.0.0)
actionpack (= 8.0.0)
actionview (= 8.0.0)
activejob (= 8.0.0)
activesupport (= 8.0.0)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (7.2.2)
actionview (= 7.2.2)
activesupport (= 7.2.2)
actionpack (8.0.0)
actionview (= 8.0.0)
activesupport (= 8.0.0)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4, < 3.2)
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
useragent (~> 0.16)
actiontext (7.2.2)
actionpack (= 7.2.2)
activerecord (= 7.2.2)
activestorage (= 7.2.2)
activesupport (= 7.2.2)
actiontext (8.0.0)
actionpack (= 8.0.0)
activerecord (= 8.0.0)
activestorage (= 8.0.0)
activesupport (= 8.0.0)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.2.2)
activesupport (= 7.2.2)
actionview (8.0.0)
activesupport (= 8.0.0)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.2.2)
activesupport (= 7.2.2)
activejob (8.0.0)
activesupport (= 8.0.0)
globalid (>= 0.3.6)
activemodel (7.2.2)
activesupport (= 7.2.2)
activerecord (7.2.2)
activemodel (= 7.2.2)
activesupport (= 7.2.2)
activemodel (8.0.0)
activesupport (= 8.0.0)
activerecord (8.0.0)
activemodel (= 8.0.0)
activesupport (= 8.0.0)
timeout (>= 0.4.0)
activestorage (7.2.2)
actionpack (= 7.2.2)
activejob (= 7.2.2)
activerecord (= 7.2.2)
activesupport (= 7.2.2)
activestorage (8.0.0)
actionpack (= 8.0.0)
activejob (= 8.0.0)
activerecord (= 8.0.0)
activesupport (= 8.0.0)
marcel (~> 1.0)
activesupport (7.2.2)
activesupport (8.0.0)
base64
benchmark (>= 0.3)
bigdecimal
Expand All @@ -81,12 +80,13 @@ GEM
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
ast (2.4.2)
autoprefixer-rails (10.4.19.0)
execjs (~> 2)
awesome_print (1.9.2)
base64 (0.2.0)
benchmark (0.3.0)
benchmark (0.4.0)
bigdecimal (3.1.8)
bootstrap-propshaft (5.3.2.2)
autoprefixer-rails (>= 9.1.0)
Expand Down Expand Up @@ -153,7 +153,7 @@ GEM
marcel (1.0.4)
mini_mime (1.1.5)
minitest (5.25.1)
net-imap (0.5.0)
net-imap (0.5.1)
date
net-protocol
net-pop (0.1.2)
Expand Down Expand Up @@ -181,7 +181,7 @@ GEM
activesupport (>= 7.0.0)
rack
railties (>= 7.0.0)
psych (5.1.2)
psych (5.2.0)
stringio
puma (6.4.3)
nio4r (~> 2.0)
Expand All @@ -193,30 +193,30 @@ GEM
rack (>= 1.3)
rackup (2.2.0)
rack (>= 3)
rails (7.2.2)
actioncable (= 7.2.2)
actionmailbox (= 7.2.2)
actionmailer (= 7.2.2)
actionpack (= 7.2.2)
actiontext (= 7.2.2)
actionview (= 7.2.2)
activejob (= 7.2.2)
activemodel (= 7.2.2)
activerecord (= 7.2.2)
activestorage (= 7.2.2)
activesupport (= 7.2.2)
rails (8.0.0)
actioncable (= 8.0.0)
actionmailbox (= 8.0.0)
actionmailer (= 8.0.0)
actionpack (= 8.0.0)
actiontext (= 8.0.0)
actionview (= 8.0.0)
activejob (= 8.0.0)
activemodel (= 8.0.0)
activerecord (= 8.0.0)
activestorage (= 8.0.0)
activesupport (= 8.0.0)
bundler (>= 1.15.0)
railties (= 7.2.2)
railties (= 8.0.0)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.2.2)
actionpack (= 7.2.2)
activesupport (= 7.2.2)
railties (8.0.0)
actionpack (= 8.0.0)
activesupport (= 8.0.0)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
Expand All @@ -227,7 +227,7 @@ GEM
rdoc (6.7.0)
psych (>= 4.0.0)
regexp_parser (2.9.2)
reline (0.5.10)
reline (0.5.11)
io-console (~> 0.5)
rexml (3.3.9)
rubocop (1.68.0)
Expand All @@ -240,7 +240,7 @@ GEM
rubocop-ast (>= 1.32.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.34.0)
rubocop-ast (1.34.1)
parser (>= 3.3.1.0)
rubocop-minitest (0.36.0)
rubocop (>= 1.61, < 2.0)
Expand Down Expand Up @@ -270,14 +270,15 @@ GEM
simplecov_json_formatter (0.1.4)
sqlite3 (2.2.0-x86_64-darwin)
sqlite3 (2.2.0-x86_64-linux-gnu)
stringio (3.1.1)
stringio (3.1.2)
temple (0.10.3)
thor (1.3.2)
tilt (2.4.0)
timeout (0.4.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.6.0)
uri (1.0.1)
useragent (0.16.10)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
Expand Down
6 changes: 3 additions & 3 deletions app/assets/stylesheets/sass/tables/_table.sass
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@
cursor: pointer
.glyph
margin: 0
input, span
border-color: $btn-color !important

.table
.action
width: 135px
.dropdown_select
margin-bottom: 0px !important
.progress
Expand All @@ -37,3 +36,4 @@
strong
padding-left: .25rem
padding-right: .25rem

2 changes: 1 addition & 1 deletion lib/ui_bibz/infos.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ module UiBibz
REPO = 'git+https://github.com/thooams/ui_bibz.git'
EMAIL = '[email protected]'
AUTHOR = 'Thooams [Thomas HUMMEL]'
VERSION = '4.0.0.beta14'
VERSION = '4.0.0.beta15'
AUTHORS = ['Thooams'].freeze
end
8 changes: 5 additions & 3 deletions lib/ui_bibz/ui/ux/tables/table_search_field.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def search_field_html
content_tag :div, html_options do
concat content_tag(:span, UiBibz::Ui::Core::Icons::Glyph.new('magnifying-glass').render, class: 'input-group-text')
concat tag(:input, type: 'search', value: search_content, name: 'search', class: 'form-control', placeholder: search_placeholder_field)
concat tag(:input, type: 'hidden', name: 'store_id', value: store.id) unless store.id.nil? # if there is more one table in html page
concat tag(:input, type: 'hidden', name: 'store_id', value: store.id) unless store.id.nil? # if there is more one table in a html page
concat tag(:input, type: 'hidden', name: 'link_type', value: 'search')
concat content_tag(:span, UiBibz::Ui::Core::Icons::Glyph.new('times-circle').render, class: 'clear-search-btn input-group-text')
end
Expand All @@ -54,7 +54,7 @@ def search_field_html_in_wrap
store.parameters.with_indifferent_access.reject { |k, _| default_parameters?(k) }.each do |k, v|
concat tag(:input, type: 'hidden', name: k, value: v)
end
concat tag(:input, type: 'hidden', name: 'store_id', value: store.id) unless store.id.nil? # if there is more one table in html page
concat tag(:input, type: 'hidden', name: 'store_id', value: store.id) unless store.id.nil? # if there is more one table in a html page
concat tag(:input, type: 'hidden', name: 'link_type', value: 'search')
concat tag(:input, type: 'search', value: search_content, name: 'search', class: 'form-control', placeholder: search_placeholder_field)
concat clear_button
Expand All @@ -66,7 +66,9 @@ def search_content
end

def clear_button
content_tag :button, UiBibz::Ui::Core::Icons::Glyph.new('times-circle', text: false, label: 'Clear Search').render, type: :button, class: 'btn btn-secondary input-group-btn clear-search-btn'
# content_tag :button, UiBibz::Ui::Core::Icons::Glyph.new('times-circle', text: false, label: 'Clear Search').render, type: :button, class: 'btn btn-secondary input-group-btn clear-search-btn'
text = UiBibz::Utils::Internationalization.new('ui_bibz.grid.searchable.clear_search', default: 'Clear Search').translate
UiBibz::Ui::Core::Forms::Buttons::Button.new(text, { glyph: 'times-circle', text: false, tooltip: true, outline: options[:outline] }, { type: :button, class: 'clear-search-btn input-group-btn' }).render
end

def component_html_classes
Expand Down
6 changes: 6 additions & 0 deletions vendor/assets/stylesheets/bootstrap.min.css

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions vendor/assets/stylesheets/fontawesome/all.min.css

Large diffs are not rendered by default.

Loading

0 comments on commit d60c15e

Please sign in to comment.