Merge remote-tracking branch 'remotes/origin/inbox-options'

app/assets/javascripts/inbox.coffee

@@ -122,10 +122,11 @@ $(document).on "click", "button[name=ib-destroy]", ->
         btn.button "reset"
         $("textarea[name=ib-answer][data-id=#{iid}]").removeAttr "readonly"
 
+
 # Toggle button
 $(document).on "click", "button[name=ib-options]", ->
   btn = $(this)
-  ibid = btn[0].dataset.ib_id
+  ibid = btn[0].dataset.ibId
   state = btn[0].dataset.state
   optionBox = $("#ib-options-#{ibid}")
 

app/views/inbox/_entry.html.haml

@@ -24,10 +24,11 @@
     %button.btn.btn-danger{name: 'ib-destroy', data: { ib_id: i.id }}
       Delete
     %button.btn.btn-default{name: 'ib-options', data: { ib_id: i.id, state: :hidden }}
-      Options
+      %i.fa.fa-cog
+      %span.sr-only Options
   .panel-footer{id: "ib-options-#{i.id}", style: 'display: none'}
     %h4 Sharing
-    - if @services.count > 0
+    - if current_user.services.count > 0
       .row
       - current_user.services.each do |service|
         .col-md-2.col-sm-4.col-xs-6