Merge branch 'master' into 263-refactoring

app/assets/stylesheets/design/custom.scss

@@ -816,6 +816,10 @@ ul.ui-autocomplete.has_results {
     overflow: auto;
 }
 
+#add_collaborator_form div.admin-search.withimage {
+    width: 301px;
+}
+
 #add_collaborator_form div.search_string {
     margin-left: 5px;
     float: left;
@@ -824,13 +828,9 @@ ul.ui-autocomplete.has_results {
 #add_collaborator_form div.img {
     width: 25px;
     height: 25px;
-//    border: 1px solid #DDDDDD;
-//    border-radius: 2px;
 }
 
 #add_collaborator_form div.img img {
-//    margin-top: 1px;
-//    margin-left: 1px;
 }
 
 #add_collaborator_form .admin-role .lineForm {

app/views/collaborators/index.html.haml

@@ -14,8 +14,9 @@
   .admin-role
     .lineForm
       = select_tag 'role', options_for_collaborators_roles_select
-      %a{:id => 'add_collaborator_button', :class => 'button', :rel => 'nofollow', :href => 'javascript:void(0)'}
-        = t('layout.add')
+  .admin-add
+    %a{:id => 'add_collaborator_button', :class => 'button', :rel => 'nofollow', :href => 'javascript:void(0)'}
+      = t('layout.add')
   .both
 
 %table#collaborators.tablesorter{:cellpadding => "0", :cellspacing => "0"}

app/views/projects/_sidebar.html.haml

@@ -11,5 +11,5 @@
         %li{:class => (act == :sections && contr == :projects) ? 'active' : ''}
           = link_to t("layout.projects.sections"), sections_project_path(@project)
       - if can? :manage_collaborators, @project
-        %li{:class => (act == :edit && contr == :collaborators) ? 'active' : ''}
+        %li{:class => (act == :index && contr == :collaborators) ? 'active' : ''}
           = link_to t("layout.projects.edit_collaborators"), project_collaborators_path(@project)