start of making nickname optional

app/views/admin/users/_users.html.haml

@@ -4,7 +4,8 @@
 %table.table.table-striped
   %thead
     %tr
-      %th= t '.login'
+      - if FoodsoftConfig[:use_nick]
+        %th= t '.login'
       %th= t '.name'
       %th= t '.email'
       %th= t 'admin.access_to'
@@ -13,8 +14,9 @@
   %tbody
     - for user in @users 
       %tr
-        %td= link_to user.nick, [:admin, user]
-        %td= user.name
+        %td= link_to show_user(user, full: true), [:admin, user]
+        - if FoodsoftConfig[:use_nick]
+          %td= user.name
         %td= user.email
         %td= format_roles(user)
         %td= format_time(user.last_login)

app/views/admin/users/show.html.haml

@@ -1,4 +1,4 @@
-- title @user.nick
+- title show_user(@user)
 
 .row-fluid
   .span3
@@ -6,8 +6,9 @@
       %h4= t '.person'
       %p= t '.member_since', time: distance_of_time_in_words(Time.now, @user.created_on)
       %dl
-        %dt= t '.nick'
-        %dd= @user.nick
+        - if FoodsoftConfig[:use_nick]
+          %dt= t '.nick'
+          %dd= @user.nick
         %dt= t '.name'
         %dd= h @user.name
         %dt= t '.email'