Permalink
Browse files

Tweaks the layout and user index to remove information not relevant f…

…or Bushido users
  • Loading branch information...
sgrove committed Feb 23, 2012
1 parent 3a902b8 commit a5cf8685f6a1195349d896ed867d5b1c50960770
Showing with 30 additions and 23 deletions.
  1. +8 −3 app/views/layouts/application.html.erb
  2. +22 −20 app/views/users/index.html.erb
@@ -45,11 +45,16 @@
</ul>
<%- end %>
</li>
- <li><%= link_to current_user.email, edit_user_registration_path %></li>
- <li><%= link_to t('log out'), destroy_user_session_path %></li>
+ (<%= current_user.email %>)
+ <% unless Devise.on_bushido? %>
+ <li><%= link_to current_user.email, edit_user_registration_path %></li>
+ <% end %>
+ <li><%= link_to t('log out'), destroy_user_session_path %></li>
<% else %>
<li><%= link_to t('log in'), new_user_session_path %></li>
- <li><%= link_to t('sign up'), new_user_registration_path %></li>
+ <% unless Devise.on_bushido? %>
+ <li><%= link_to t('sign up'), new_user_registration_path %></li>
+ <% end %>
<% end %>
</ul>
</div>
@@ -9,25 +9,27 @@
:method => :delete %></li>
<% end %>
</ul>
-<h2>Add a new member</h2>
-<div class="form-wrapper">
-<%= form_for project_users_path(@project, @user) do |f| %>
- <% fields_for :user do |u| %>
- <div class="field-wrapper">
- <%= u.label :email %>
- <div class="field"><%= u.text_field :email %></div>
- </div>
- <div class="field-wrapper">
- <%= u.label :name %>
- <div class="field"><%= u.text_field :name %></div>
- </div>
- <div class="field-wrapper">
- <%= u.label :initials %>
- <div class="field"><%= u.text_field :initials %></div>
- </div>
- <div class="actions">
- <%= u.submit 'Add user' %>
- </div>
+<% unless Devise.on_bushido? %>
+ <h2>Add a new member</h2>
+ <div class="form-wrapper">
+ <%= form_for project_users_path(@project, @user) do |f| %>
+ <% fields_for :user do |u| %>
+ <div class="field-wrapper">
+ <%= u.label :email %>
+ <div class="field"><%= u.text_field :email %></div>
+ </div>
+ <div class="field-wrapper">
+ <%= u.label :name %>
+ <div class="field"><%= u.text_field :name %></div>
+ </div>
+ <div class="field-wrapper">
+ <%= u.label :initials %>
+ <div class="field"><%= u.text_field :initials %></div>
+ </div>
+ <div class="actions">
+ <%= u.submit 'Add user' %>
+ </div>
+ <% end %>
<% end %>
+ </div>
<% end %>
-</div>

0 comments on commit a5cf868

Please sign in to comment.