-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* release/0.4.1: #285 add eye to password input fix bug with inflections #303 add message if no unviewed #304 add deputies
- Loading branch information
Showing
12 changed files
with
89 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -255,3 +255,7 @@ input[type=checkbox] { | |
margin-left: 100px; | ||
} | ||
} | ||
|
||
.eye { | ||
padding-top: 10px; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
class PasswordFoundationInput < SimpleForm::Inputs::StringInput | ||
def input(wrapper_options) | ||
value = object.send(attribute_name) if object.respond_to? attribute_name | ||
input_html_options[:type] = 'password' | ||
|
||
button = template.content_tag :div, class: 'small-1 columns input' do | ||
template.content_tag :a, href: '#', class: 'button postfix eye', type: 'button' do | ||
template.content_tag :span, '', class: 'fa fa-eye' | ||
end | ||
end | ||
password_input = template.content_tag :div, class: 'small-11 columns input' do | ||
super(wrapper_options) | ||
end | ||
template.content_tag :div, class: 'row-fluid' do | ||
password_input + button | ||
end | ||
end | ||
|
||
def input_html_classes | ||
super.push '' # 'form-control' | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,20 @@ | ||
- tabs = Concerns::NotificatableItems.items | ||
- title | ||
#tabs | ||
%ul.nav.nav-tabs{ role: :tablist } | ||
- if no_any_unviewed?(@unviewed) | ||
%h2 | ||
= t('.there_is_not_any_unviewed_record') | ||
- else | ||
#tabs | ||
%ul.nav.nav-tabs{ role: :tablist } | ||
- tabs.each do |tab| | ||
- pluralize_tab = tab.to_s.pluralize(:en) | ||
- total_count = @unviewed[pluralize_tab.to_sym].total_count | ||
- if total_count > 0 | ||
%li | ||
= link_to unviewed_tab_title(tab, total_count), "##{pluralize_tab}" | ||
- tabs.each do |tab| | ||
- pluralize_tab = tab.to_s.pluralize(:en) | ||
%li | ||
= link_to unviewed_tab_title(tab, @unviewed[pluralize_tab.to_sym].total_count), "##{pluralize_tab}" | ||
- tabs.each do |tab| | ||
- pluralize_tab = tab.to_s.pluralize | ||
%div{ id: pluralize_tab } | ||
= render "web/admin/#{pluralize_tab}/#{pluralize_tab}_list", pluralize_tab.to_sym => @unviewed[pluralize_tab.to_sym] | ||
- pluralize_tab = tab.to_s.pluralize | ||
- total_count = @unviewed[pluralize_tab.to_sym].total_count | ||
- if total_count > 0 | ||
%div{ id: pluralize_tab } | ||
= render "web/admin/#{pluralize_tab}/#{pluralize_tab}_list", pluralize_tab.to_sym => @unviewed[pluralize_tab.to_sym] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters