app/views/segments/show.html.haml in artfully_ose-1.2.0.pre.23 vs app/views/segments/show.html.haml in artfully_ose-1.2.0.pre.24

- old
+ new

@@ -11,11 +11,11 @@ %h3 Details .details-long= @segment.description.html_safe %ul.in-table %li.dropdown#bulkactions - =icon_link_to('Work with...', "#menu#bulkactions", 'icon-asterisk', 'dropdown-toggle dropdown btn', '') + =icon_link_to('Work with...', "#menu#bulkactions", 'fa-asterisk', 'dropdown-toggle dropdown btn', '') %ul.dropdown-menu %li =link_to "Tag all", "#tag-modal", 'data-toggle' => 'modal', :rel => "tooltip", :data => {:toggle => "modal", "original-title" => "Give all of the people in this list segment the same tag.", :trigger => "hover", :placement => "right"} %li =link_to "Log action", "#bulk-action-modal", :id => 'bulk-action-link', 'data-toggle' => 'modal' @@ -46,13 +46,13 @@ .modal-header .close{"data-dismiss" => "modal"} × %h3 Tag everyone in #{@segment.name} .modal-body -# = text_field_tag :name, "", :placeholder => "tag-name", :required => "required" - =text_field_tag :name, "", :id=>"new-tag-field", :required => "required", :class => "typeahead", "data-provide"=>"typeahead", :autocomplete => 'off', "data-items"=>"5", "data-source"=>"[" + @tags_string.html_safe + "]" + =text_field_tag :name, "", :id=>"new-tag-field", :required => "required", :class => "typeahead", "data-provide"=>"typeahead", :autocomplete => 'off', "data-items"=>"5", "data-source"=>"[" + @tags_string.html_safe + "]" .tag-error %p This tag will be applied to people that are currently in this list segment. Any future additions/deletions to this list will not be automatically tagged. .modal-footer = submit_tag "Save", :class => "btn" #bulk-action-modal.action-form.modal - = render :partial => 'actions/modal', :locals => {:action => Action.for_organization(current_user.current_organization), :target => @segment} \ No newline at end of file + = render :partial => 'actions/modal', :locals => {:action => Action.for_organization(current_user.current_organization), :target => @segment}