houston-core 0.7.0 → 0.8.0.pre

data/app/views/devise/sessions/new.html.erb

@@ -7,26 +7,28 @@
 
 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => "form-horizontal"}) do |f| %>
   <fieldset>
-    <div class="control-group">
-      <div class="controls">
-        <em><%= Houston::TMI::INSTRUCTIONS_FOR_LOGIN %></em>
+    <% if Houston.config.authentication_strategy_configuration[:instructions] %>
+      <div class="control-group">
+        <div class="controls">
+          <em><%= Houston.config.authentication_strategy_configuration[:instructions] %></em>
+        </div>
       </div>
-    </div>
-    
+    <% end %>
+
     <div class="control-group">
       <%= f.label :email, "Username or Email", :class => 'control-label' %>
       <div class="controls">
         <%= f.text_field :email, :class => 'text_field' %>
       </div>
     </div>
-  
+
     <div class="control-group">
       <%= f.label :password, :class => 'control-label' %>
       <div class="controls">
         <%= f.password_field :password, :class => 'text_field' %>
       </div>
     </div>
-  
+
     <% if devise_mapping.rememberable? -%>
       <div class="control-group">
         <div class="controls remember-me">

data/app/views/layouts/_mobile_navigation.html.erb

@@ -25,9 +25,11 @@
 
       <li class="divider-horizontal"></li>
 
-      <% if can?(:read, Project) -%>
-        <%= render_nav_link "Projects", main_app.projects_path, icon: "fa-database" %>
-      <% end -%>
+      <% if can?(:manage, Team) %>
+        <li><%= link_to "Teams", main_app.teams_path %></li>
+      <% end %>
+
+      <li class="divider-horizontal"></li>
 
     </ul>
   </div>

data/app/views/layouts/_navigation.html.erb

@@ -5,14 +5,23 @@
     <ul class="nav pull-right">
       <% if current_user -%>
 
-        <% if can?(:manage, User) || can?(:read, Action) %>
+        <% if can?(:read, User) || can?(:read, Team) || can?(:read, Project) || can?(:read, Action) %>
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i> <b class="caret"></b></a>
             <ul class="dropdown-menu">
-              <% if can?(:manage, User) %>
+              <% if can?(:read, Team) %>
+                <li><%= link_to "Teams", main_app.teams_path %></li>
+              <% end %>
+              <% if can?(:read, Project) %>
+                <li><%= link_to "Projects", main_app.projects_path %></li>
+              <% end %>
+              <% if can?(:read, User) %>
                 <li><%= link_to "Users", main_app.users_path %></li>
               <% end %>
               <% if can?(:read, Action) %>
+                <% if can?(:read, User) || can?(:read, Team) || can?(:read, Project) %>
+                  <li class="divider"></li>
+                <% end %>
                 <li><%= link_to "Actions", main_app.actions_path %></li>
                 <li><%= link_to "Running Actions", main_app.running_actions_path %></li>
                 <li><%= link_to "Triggers", main_app.triggers_path %></li>
@@ -35,15 +44,7 @@
       <% end -%>
     </ul>
     <ul class="nav">
-
       <% Houston.config.navigation.each do |navigation| %><%= render_navigation navigation %><% end %>
-
-      <li class="divider-vertical"></li>
-
-      <% if can?(:read, Project) -%>
-        <%= render_nav_link "Projects", main_app.projects_path, icon: "fa-archive" %>
-      <% end -%>
-
     </ul>
   </div>
 </div>

data/app/views/layouts/_tester_bar.html.erb

@@ -1,6 +1,6 @@
 <div style="position: fixed; left: 0; right: 0; bottom: 0; height: 42px; line-height: 36px; background: black; padding-left: 4px; z-index: 100;">
   <form action="/tester_bar/login_as">
-    <%= select_tag "email", options_for_select(User.unretired.map { |u| ["#{u.name} (#{u.role}#{", Admin" if u.administrator?})", u.email] }, current_user.try(:email)), :style => "margin-bottom: 0" %>
+    <%= select_tag "email", options_for_select(User.unretired.map { |u| [u.role == "Member" ? u.name : "#{u.name} (#{u.role})", u.email] }, current_user.try(:email)), :style => "margin-bottom: 0" %>
     <button class="btn btn-primary" type="submit" title="Log in as any user">Login</button>
   </form>
 </div>

data/app/views/layouts/application.html.erb

@@ -81,8 +81,7 @@
           id: current_user.id,
           email: current_user.email,
           name: current_user.name,
-          role: current_user.role,
-          admin: current_user.administrator?
+          role: current_user.role
         }.to_json) %>);
         <% end %>
       });

data/app/views/project_tickets/_tickets.html.erb

@@ -10,7 +10,6 @@
           <td class="ticket-reporter"></td>
           <th class="ticket-summary" data-attribute="summary">Summary</th>
           <th class="ticket-milestone" data-attribute="milestone">Milestone</th>
-          <th class="ticket-antecedents" data-attribute="antecedents">Antecedents</th>
           <th class="ticket-opened date sort-asc" data-attribute="openedAt">Opened</th>
           <th class="ticket-closed date" data-attribute="closedAt">Closed</th>
           <td class="table-margin"></td>

data/app/views/project_tickets/index.xls.erb

@@ -85,39 +85,4 @@
    <ProtectScenarios>False</ProtectScenarios>
   </WorksheetOptions>
  </Worksheet>
- <Worksheet ss:Name="Antecedents">
-  <Table ss:ExpandedColumnCount="3" ss:ExpandedRowCount="<%= 1 + @tickets.sum { |ticket| ticket.antecedents.length } %>" x:FullColumns="1"
-   x:FullRows="1" ss:DefaultColumnWidth="65" ss:DefaultRowHeight="15">
-   <Column ss:AutoFitWidth="0" ss:Width="100"/>
-   <Column ss:AutoFitWidth="0" ss:Width="75"/>
-   <Column ss:AutoFitWidth="0" ss:Width="75"/>
-   <Row ss:StyleID="s65">
-    <Cell><Data ss:Type="String">Ticket Number</Data></Cell>
-    <Cell><Data ss:Type="String">ID</Data></Cell>
-    <Cell><Data ss:Type="String">Kind</Data></Cell>
-   </Row>
-   <% @tickets.each do |ticket| %>
-   <% ticket.antecedents.each do |antecedent| %>
-   <Row>
-    <Cell><Data ss:Type="Number"><%= ticket.number %></Data></Cell>
-    <Cell><Data ss:Type="String"><%= antecedent.id %></Data></Cell>
-    <Cell><Data ss:Type="String"><%= antecedent.kind %></Data></Cell>
-   </Row>
-   <% end %>
-   <% end %>
-  </Table>
-  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
-   <PageLayoutZoom>0</PageLayoutZoom>
-   <Selected/>
-   <Panes>
-    <Pane>
-     <Number>3</Number>
-     <ActiveRow>1</ActiveRow>
-     <ActiveCol>2</ActiveCol>
-    </Pane>
-   </Panes>
-   <ProtectObjects>False</ProtectObjects>
-   <ProtectScenarios>False</ProtectScenarios>
-  </WorksheetOptions>
- </Worksheet>
 </Workbook>

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

@@ -10,8 +10,7 @@
       project: {
         slug: <%= raw @project.slug.to_json %>,
         ticketTrackerName: <%= raw @project.ticket_tracker_name.to_json %><%# so that we can log in %>
-      },
-      labels: <%= raw @labels.to_json %>
+      }
     }).render();
   });
 </script>

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

@@ -14,6 +14,13 @@
       </div>
     </div>
 
+    <div class="control-group">
+      <%= f.label :team_id, :class => "control-label" %>
+      <div class="controls">
+        <%= f.select :team_id, [["", nil]] + Team.all.pluck(:name, :id), :class => "select_field" %>
+      </div>
+    </div>
+
     <div class="control-group">
       <%= f.label :color, :class => "control-label" %>
       <div class="controls">
@@ -104,18 +111,6 @@
       <% end %>
     <% end %>
 
-    <hr />
-
-    <div class="control-group">
-      <%= f.label :roles, "Teammates", :class => "control-label" %>
-      <div class="controls changes-nested-editor">
-        <%= f.nested_editor_for :roles do |f| -%>
-          <%= f.select :user_id, [nil] + User.all.map { |user| [user.name, user.id] } %>
-          <%= f.select :name, [nil] + Houston.config.project_roles %>
-        <% end -%>
-      </div>
-    </div>
-
     <div class="form-actions">
       <%= f.submit nil, :class => "btn btn-primary" %>
       <%= link_to "Cancel", projects_path, :class => "btn" %>

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

@@ -1,8 +1,6 @@
 <% content_for :title do %>
 <h1 class="project-banner space-below">
   Projects
-  <%= link_to "New Project", new_project_path, :class => "btn btn-primary" if can?(:create, Project) %>
-  <%= link_to "Add Projects from GitHub", add_github_projects_path, :class => "btn btn-primary" if can?(:create, Project) %>
 
   <%= render partial: "projects/keyboard_shortcuts" %>
 </h1>
@@ -16,8 +14,7 @@
           <td class="table-margin"></td>
           <td class="project-feature-error"></td>
           <th class="project-title sort-desc">Title</th>
-          <th class="project-maintainers">Maintainers</th>
-          <th class="project-owners">Owners</th>
+          <th class="project-team">Team</th>
 <% if current_user.developer? %>
           <th class="project-last-commit">Last Commit</th>
         <% KeyDependency.all.each do |dependency| %>
@@ -54,15 +51,10 @@
               <%= link_to_if can?(:update, project), project.name, edit_project_path(project) %>
             </td>
 
-            <td class="project-maintainers project-participants">
-              <% project.maintainers.each do |maintainer| %><%= link_to avatar_for(maintainer), user_path(maintainer), :class => "project-maintainer project-participant", :rel => "tooltip", :title => maintainer.name, "data-placement" => "right" %><span class="hidden-text"><%= maintainer.first_name %></span><!-- so sort works --><% end %>
+            <td class="project-team">
+              <%= project.team && project.team.name %>
             </td>
 
-            <td class="project-owners project-participants">
-              <% project.owners.each do |owner| %><%= link_to avatar_for(owner), user_path(owner), :class => "project-owner project-participant", :rel => "tooltip", :title => owner.name, "data-placement" => "right" %><span class="hidden-text"><%= owner.first_name %></span><!-- so sort works --><% end %>
-            </td>
-
-
 
 <% if current_user.developer? %>
 
@@ -127,13 +119,14 @@
 
             <td class="project-following">
               <% if current_user %>
-                <% roles_for_project = current_user.roles.find_all { |role| role.project_id == project.id }.map(&:name) %>
-                <% if roles_for_project.none? %>
-                  <%= button_to "Follow", project_follow_path(project), method: :post, class: "btn btn-primary" %>
-                <% elsif roles_for_project == %w{Follower} %>
-                  <%= button_to "Unfollow", project_unfollow_path(project), method: :delete, class: "btn" %>
+                <% if current_user.follows?(project) %>
+                  <%= button_to project_unfollow_path(project), method: :delete, class: "btn-link" do %>
+                    <i class="fa fa-star"/></i>
+                  <% end %>
                 <% else %>
-                  <%= roles_for_project.to_sentence %>
+                  <%= button_to project_follow_path(project), method: :post, class: "btn-link" do %>
+                    <i class="fa fa-star-o"/></i>
+                  <% end %>
                 <% end %>
               <% end %>
             </td>

data/app/views/releases/_changelog.html.erb

@@ -1,5 +1,5 @@
 <div id="<%= @release.project.slug %>_changelog" class="-houston-changelog">
-  
+
   <div class="-houston-changelog-day">
     <h4>
       <% if (defined?(draft) && draft) %>
@@ -11,38 +11,35 @@
       <%= link_to "Edit", edit_release_path(@release) if can?(:update, @release) and !(defined?(draft) && draft) %>
     </h4>
   </div>
-  
+
   <%= div_for @release do %>
-    
+
     <% unless @release.message.blank? %>
     <div class="release-message">
       <%= mdown(@release.message) %>
     </div>
     <% end %>
-    
+
     <% if @release.release_changes.any? %>
       <div class="release-changes">
         <% ordered_by_tag(@release.release_changes).each do |change| %>
-          <% if can?(:read, change) %>
-            <div class="change">
-              <%= format_change_tag change.tag %>
-              <div class="change-summary"><%= format_change(change) %></div>
-            </div>
-          <% end %>
+          <div class="change">
+            <%= format_change_tag change.tag %>
+            <div class="change-summary"><%= format_change(change) %></div>
+          </div>
         <% end %>
       </div>
     <% else %>
       <div class="release-no-changes">No changes</div>
     <% end %>
-    
+
     <% unless (defined?(draft) && draft) %>
       <div class="release-detail">
         <%= render partial: "releases/tickets", locals: {tickets: @release.tickets} if can?(:read, Ticket) %>
-        <%= render partial: "releases/antecedents", locals: {antecedents: @release.antecedents} if can?(:read, Ticket) %>
         <%= render partial: "releases/commits", locals: {commits: @release.commits} if can?(:read, Commit) && !for_email? %>
       </div>
     <% end %>
-    
+
   <% end %>
-  
+
 </div>

data/app/views/teams/_form.html.erb

@@ -0,0 +1,45 @@
+<%= form_for @team, :html => { :class => "form-horizontal" } do |f| %>
+  <fieldset>
+    <div class="control-group">
+      <%= f.label :name, :class => "control-label" %>
+      <div class="controls">
+        <%= f.text_field :name, :class => "text_field" %>
+      </div>
+    </div>
+
+    <hr />
+
+    <div class="control-group">
+      <%= f.label :roles, "Teammates", :class => "control-label" %>
+      <div class="controls changes-nested-editor">
+        <%= f.nested_editor_for :roles do |f| -%>
+          <%= f.select :user_id, [nil] + User.unretired.pluck("CONCAT(first_name, ' ', last_name)", :id) %>
+          <% Houston.config.roles.each do |role| %>
+            <% role_slug = role.downcase.gsub(" ", "_").pluralize %>
+            <label style="display: inline-block">
+              <input type="checkbox" name="team[roles_attributes][0][roles][]" value="<%= role %>" <%= "checked" if f.object.roles.member?(role) %> />
+              <%= role %>
+            </label>
+          <% end %>
+        <% end -%>
+      </div>
+    </div>
+
+    <div class="form-actions">
+      <%= f.submit nil, :class => "btn btn-primary" %>
+      <%= link_to "Cancel", teams_path, :class => "btn" %>
+    </div>
+  </fieldset>
+<% end %>
+
+<% content_for :javascripts do %>
+<script type="text/javascript">
+  $(function() {
+    NestedEditorFor.init();
+
+    $(document.body).on('nested-editor.reset', function(e) {
+      $(e.target).find(':checkbox').prop('checked', false);
+    });
+  });
+</script>
+<% end %>

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

@@ -0,0 +1,8 @@
+<% content_for :title do %>
+<h1 class="project-banner space-below">
+  <small>Edit</small>
+  <%= @team.name %>
+</h1>
+<% end %>
+
+<%= render partial: "form" %>

data/app/views/teams/index.html.erb

@@ -0,0 +1,62 @@
+<% content_for :title do %>
+<h1 class="project-banner space-below">
+  Teams
+  <%= link_to "New Team", new_team_path, :class => "btn btn-primary" if can?(:create, Team) %>
+
+  <%= render partial: "projects/keyboard_shortcuts" %>
+</h1>
+<% end %>
+
+<div class="teams">
+<% @teams.each do |team| %>
+  <div class="team-wrapper">
+    <div class="team">
+      <h3 class="team-name">
+        <%= link_to_if can?(:update, team), team.name, edit_team_path(team) %>
+      </h3>
+      <h6>Teammates</h6>
+      <ol class="team-members">
+        <% team.roles.sort_by { |role| Houston.config.roles.find_index { |r| role.roles.member?(r) } || 999 }.each do |role| %>
+          <li class="team-member">
+            <span class="user-avatar"><%= avatar_for(role.user, size: 32) %></span>
+            <span class="user-name">
+              <%= link_to user_path(role.user) do %>
+                <span class="first-name"><%= role.user.first_name %></span>
+                <span class="last-name"><%= role.user.last_name[0] %></span>
+              <% end %>
+            </span>
+            <span class="user-roles">
+              <%= role.roles.any? ? role.roles.join(", ") : "" %>
+            </span>
+          </li>
+        <% end %>
+      </ol>
+      <h6>Projects</h6>
+
+      <% if team.projects.any? %>
+        <ol class="team-projects">
+          <% team.projects.each do |project| %>
+            <li class="team-project">
+              <% if project.color %>
+                <b class="bubble <%= project.color %>" rel="tooltip" title="<%= project.color.titleize %>" data-tooltip-placement="right"></b>
+              <% else %>
+                <b class="bubble"></b>
+              <% end %>
+              <%= link_to project.name, teams_path(project: project.slug) %>
+            </li>
+          <% end %>
+        </ol>
+      <% else %>
+        <div class="team-projects-empty">No projects</div>
+      <% end %>
+
+      <% if can?(:create, team.projects.build) %>
+        <div class="team-projects-add">
+          <%= link_to "New Project", new_project_path(team), :class => "btn btn-mini btn-default" %>
+          <%= link_to "Add Projects from GitHub", add_github_projects_path(team), :class => "btn btn-mini btn-default" %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+<% end %>
+</div>

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

@@ -0,0 +1,7 @@
+<% content_for :title do %>
+<h1 class="project-banner space-below">
+  New Team
+</h1>
+<% end %>
+
+<%= render partial: "form" %>