saucy 0.1.15 → 0.1.16

data/app/views/accounts/edit.html.erb

@@ -5,7 +5,6 @@
 <%= render :partial => 'tab_bar' %>
 
 <%= content_tag_for :div, @account do -%>
-  <h3><%= @account.name %></h3>
   <%= semantic_form_for @account do |form| %>
     <%= form.inputs do %>
       <%= form.input :name, :label => "Account name" %>

data/app/views/invitations/new.html.erb

@@ -2,6 +2,8 @@
   <h2>Invite a new User</h2>
 <% end -%>
 
+<%= render :partial => 'accounts/tab_bar' %>
+
 <%= semantic_form_for [current_account, @invitation] do |form| -%>
   <%= form.inputs do -%>
     <%= form.input :email %>
@@ -13,4 +15,3 @@
     <%= form.commit_button "Invite User" %>
   <% end -%>
 <% end -%>
-

data/app/views/memberships/edit.html.erb

@@ -2,19 +2,20 @@
   <h2>Permissions for <span><%= @membership.name %></span> on <%= current_account.name %></h2>
 <% end -%>
 
+<div class="actions">
+  <%= link_to @membership, :method  => :delete, :confirm => "Are you sure?" do %>
+    <span class="delete_item">Remove <%= @membership.user.name %> from <%= current_account.name %></span>
+  <% end -%>
+</div>
+
 <%= render :partial => 'accounts/tab_bar' %>
 
 <%= semantic_form_for @membership do |form| -%>
   <%= form.inputs do -%>
-    <%= form.input :admin %>
-    <%= form.input :projects, :as => :check_boxes, :collection => @projects %>
+    <%= form.input :admin, :label => "#{@membership.user.name} is an Admin on #{current_account.name}" %>
+    <%= form.input :projects, :as => :check_boxes, :collection => @projects, :label => "#{@membership.user.name} belongs to these projects:" %>
   <% end -%>
   <%= form.buttons do -%>
-    <%= form.commit_button "Update" %>
-    <li><%= link_to "Remove from account",
-                    @membership,
-                    :method  => :delete,
-                    :confirm => "Are you sure?" %></li>
+    <%= form.commit_button "Update" %>          
   <% end -%>
 <% end -%>
-

data/app/views/projects/edit.html.erb

@@ -8,6 +8,7 @@
   <% end -%>
 </div>
 
+
 <%= render :partial => 'accounts/tab_bar' %>
 
 <%= semantic_form_for @project do |form| %>

data/app/views/projects/new.html.erb

@@ -10,4 +10,4 @@
     <%= form.commit_button %>
     <%= link_to 'Cancel', account_projects_path(current_account) %>
   <% end -%>
-<% end -%>
+<% end -%>

data/app/views/shared/_saucy_javascript.html.erb

@@ -6,7 +6,7 @@
       });
       $('#signup_account_name, #project_name').keyup(function(){
         var mainPart = /^([\w\s]*)(\W*)/.exec($(this).val())[1];
-        mainPart = mainPart.replace(/ /g, "")
+        mainPart = mainPart.replace(/ /g, "").toLowerCase();
         if(mainPart == "") mainPart = "keyword";
         $(this).siblings('p.inline-hints').find('span').text(mainPart);
         $('#signup_keyword, #project_keyword').val(mainPart);

data/lib/generators/saucy/features/templates/features/manage_users.feature

@@ -99,8 +99,9 @@ Feature: Managing users
       | name: Test | name: Frank |
     When I go to the memberships page for the "Test" account
     And I follow "Frank"
-    And I follow "Remove from account"
+    Then I should see "Frank belongs to these projects:"
+    And I should see "Frank is an Admin on Test"
+    When I follow "Remove Frank from Test"
     Then I should see "User removed"
     When I go to the memberships page for the "Test" account
     Then I should not see "Frank"
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 59
   prerelease: false
   segments: 
   - 0
   - 1
-  - 15
-  version: 0.1.15
+  - 16
+  version: 0.1.16
 platform: ruby
 authors: 
 - thoughtbot, inc.