Commit c07e0377 authored by Bryce Johnson's avatar Bryce Johnson

Round out tests for time tracking component.

parent 997def72
...@@ -125,7 +125,8 @@ ...@@ -125,7 +125,8 @@
</div> </div>
<div class='title hide-collapsed'> <div class='title hide-collapsed'>
Time tracking Time tracking
<div class='help-button pull-right' v-if='showHelp' v-on:click='toggleHelpState(true)'> <div class='help-button pull-right' v-if='!showHelp' v-on:click='toggleHelpState(true)'>
<i class='fa fa-question-circle'></i>
</div> </div>
</div> </div>
<div class='time-tracking-content hide-collapsed'> <div class='time-tracking-content hide-collapsed'>
...@@ -159,6 +160,7 @@ ...@@ -159,6 +160,7 @@
</div> </div>
<div class='time-tracking-help-state' v-if='showHelp'> <div class='time-tracking-help-state' v-if='showHelp'>
<div class='close-help-button pull-right' v-on:click='toggleHelpState(false)'> <div class='close-help-button pull-right' v-on:click='toggleHelpState(false)'>
<i class='fa fa-close'></i>
</div> </div>
<div class='time-tracking-info'> <div class='time-tracking-info'>
<h4>Track time with slash commands</h4> <h4>Track time with slash commands</h4>
...@@ -171,6 +173,7 @@ ...@@ -171,6 +173,7 @@
<code>/spend</code> <code>/spend</code>
will update the sum of the time spent. will update the sum of the time spent.
</p> </p>
<a class='btn btn-default learn-more-button' href='http://example.com/time-tracking-url'> Learn more </a>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
= dropdown_tag('Milestone', options: { title: 'Assign milestone', toggle_class: 'js-milestone-select js-extra-options', filter: true, dropdown_class: 'dropdown-menu-selectable', placeholder: 'Search milestones', data: { show_no: true, field_name: "#{issuable.to_ability_name}[milestone_id]", project_id: @project.id, issuable_id: issuable.id, milestones: namespace_project_milestones_path(@project.namespace, @project, :json), ability_name: issuable.to_ability_name, issue_update: issuable_json_path(issuable), use_id: true }}) = dropdown_tag('Milestone', options: { title: 'Assign milestone', toggle_class: 'js-milestone-select js-extra-options', filter: true, dropdown_class: 'dropdown-menu-selectable', placeholder: 'Search milestones', data: { show_no: true, field_name: "#{issuable.to_ability_name}[milestone_id]", project_id: @project.id, issuable_id: issuable.id, milestones: namespace_project_milestones_path(@project.namespace, @project, :json), ability_name: issuable.to_ability_name, issue_update: issuable_json_path(issuable), use_id: true }})
// TODO: Need to add check for time_estimated - if issuable.has_attribute?(:time_estimated) once hooked up to backend // TODO: Need to add check for time_estimated - if issuable.has_attribute?(:time_estimated) once hooked up to backend
- if issuable.has_attribute?(:time_estimate) - if issuable.has_attribute?(:time_estimate)
#issuable-time-tracker.block{ issuable: issuable.to_json() } #issuable-time-tracker.block
%issuable-time-tracker{ ':time_estimate' => 'issuable.time_estimate', ':time_spent' => 'issuable.time_spent' } %issuable-time-tracker{ ':time_estimate' => 'issuable.time_estimate', ':time_spent' => 'issuable.time_spent' }
- if issuable.has_attribute?(:due_date) - if issuable.has_attribute?(:due_date)
.block.due_date .block.due_date
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment