start of making nickname optional

app/views/shared/_comments.haml

@@ -1,5 +1,5 @@
 - comments.each do |comment|
   .comment[comment]
     %strong= comment.user.try(:ordergroup_name)
-    %small (#{comment.user.try(:nick)} am #{format_time(comment.created_at)}):
+    %small (#{show_user comment.user} am #{format_time(comment.created_at)}):
     = simple_format(comment.text)

app/views/shared/_group.html.haml

@@ -12,7 +12,7 @@
   %dd
     - members = group.users
     = "(#{members.size})"
-    = members.collect(&:nick).join(", ")
+    = members.collect{|u| show_user(u)}.join(", ")
   - unless group.is_a?(Workgroup)
     %dt= t '.apple_limit'
     %dd= group.ignore_apple_restriction ? t('.deactivated') : t('.activated')

app/views/shared/_open_orders.html.haml

@@ -19,7 +19,7 @@
             %td= format_time(order.ends) unless order.ends.nil?
             - if group_order = order.group_order(ordergroup)
               - total += group_order.price
-              %td= "#{group_order.updated_by.nick} (#{format_time(group_order.updated_on)})"
+              %td= "#{show_user group_order.updated_by} (#{format_time(group_order.updated_on)})"
               %td.numeric= number_to_currency(group_order.price)
             - else
               %td{:colspan => 2}

app/views/shared/_user_form_fields.html.haml

@@ -1,4 +1,5 @@
-= f.input :nick
+- unless FoodsoftConfig[:use_nick] == false
+  = f.input :nick
 = f.input :first_name
 = f.input :last_name
 = f.input :email
@@ -19,7 +20,8 @@
             = t 'simple_form.labels.settings.settings_group.privacy'
         = profile.input 'phone_is_public',  as: :boolean, label: false, input_html: { checked: f.object.settings.profile['phone_is_public'] }
         = profile.input 'email_is_public',  as: :boolean, label: false, input_html: { checked: f.object.settings.profile['email_is_public'] }
-        = profile.input 'name_is_public',   as: :boolean, label: false, input_html: { checked: f.object.settings.profile['name_is_public'] }
+        - if FoodsoftConfig[:use_nick]
+          = profile.input 'name_is_public',   as: :boolean, label: false, input_html: { checked: f.object.settings.profile['name_is_public'] }
   
     .settings-group
       %div{class: 'control-group'}

app/views/shared/memberships/_current_members.rhtml

@@ -8,7 +8,7 @@
 <ul style="">
     <% for membership in memberships %>
       <li style="margin-left:-15px">
-        <b><%= membership.user.nick %></b> (<%=h membership.user.first_name + ' ' + membership.user.last_name %>)
+        <%= show_user membership.user, full: true, markup: true %>
          | <%= link_to_remote t('.drop'), 
                 :url => { :controller => '/memberships', :action => 'drop_member', :id => @group, :membership_id => membership },
                 :before => "Element.show('loader')",

app/views/shared/memberships/_non_members.rhtml

@@ -1,7 +1,7 @@
 <ul>
  <% for user in @group.non_members %>
   <li>
-    <b><%= user.nick %></b> (<%=h user.first_name + ' ' + user.last_name %>)
+    <%= show_user user, full: true, markup: true %>
     | <%= link_to_remote t('.add'), 
         :url => { :controller => '/memberships', :action => 'add_member', :id => @group, :user_id => user },
         :before => "Element.show('loader')",