Skip to content

Commit

Permalink
Zenhub #1022 Conversation Templates: Update Text
Browse files Browse the repository at this point in the history
  • Loading branch information
jizhaogit committed Jul 12, 2023
1 parent 4035cbb commit 2b53ede
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -333,11 +333,11 @@
<div class="card-body">
<div class="row">
<div class="col-12">
<p><b>We have reviewed progress of goals and adjusted as necessary.</b></p>
<p><b>We have reviewed goals and adjusted as necessary.</b></p>
<p><input class="employee-sign-off1" type="radio" name="check_one" value="1"> Yes</p>
<p><input class="employee-sign-off1" type="radio" name="check_one" value="0"> No</p>
<br/>
<p><b>Performance expectations have been clearly communicated.</b></p>
<p><b>Performance expectations are clear.</b></p>
<p><input class="employee-sign-off2" type="radio" name="check_two" value="1"> Yes</p>
<p><input class="employee-sign-off2" type="radio" name="check_two" value="0"> No</p>
<br/>
Expand Down Expand Up @@ -367,11 +367,11 @@
<div class="card-body">
<div class="row">
<div class="col-12">
<p><b>We have reviewed progress of goals and adjusted as necessary.</b></p>
<p><b>We have reviewed goals and adjusted as necessary.</b></p>
<p><input class="supervisor-sign-off1" type="radio" name="check_one_" value="1"> Yes</p>
<p><input class="supervisor-sign-off1" type="radio" name="check_one_" value="0"> No</p>
<br/>
<p><b>Performance expectations have been clearly communicated.</b></p>
<p><b>Performance expectations are clear.</b></p>
<p><input class="supervisor-sign-off2" type="radio" name="check_two_" value="1"> Yes</p>
<p><input class="supervisor-sign-off2" type="radio" name="check_two_" value="0"> No</p>
<br/>
Expand Down
10 changes: 6 additions & 4 deletions resources/views/conversation/past.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@
<h5 class="mb-0" data-toggle="collapse" data-target="#collapse_sup" aria-expanded="false" aria-controls="collapse_sup">

<button class="btn btn-link text-left">
<h4>Conversations with My Supervisor</h4>
<h4>Completed Conversations with my Supervisor</h4>
</button>
<span class="float-right" id="caret_1" style="color:#1a5a96"><i class="fa fa-chevron-down"></i></span>
<br/>
<button class="btn btn-link text-left" style="color:black">
<p>The list enclosed contains all open conversations between you and your supervisor(s).</p>
<p>This area contains all conversations signed by both you and your supervisor(s).</p>
</button>
</h5>
</h5>
Expand Down Expand Up @@ -167,12 +167,12 @@
<h5 class="mb-0" data-toggle="collapse" data-target="#collapse_emp" aria-expanded="false" aria-controls="collapse_emp">

<button class="btn btn-link text-left">
<h4>Conversations with My Team</h4>
<h4>Completed Conversations with my Team</h4>
</button>
<span class="float-right" id="caret_2" style="color:#1a5a96"><i class="fa fa-chevron-down"></i></span>
<br/>
<button class="btn btn-link text-left" style="color:black">
<p>The list enclosed contains all open conversations between you and your direct reports.</p>
<p>This area contains all conversations signed by both you and your direct reports.</p>
</button>
</h5>
</h5>
Expand Down Expand Up @@ -383,6 +383,8 @@
$(".complete-border").addClass('border-primary');
$('#collapse_ins').collapse('show');
});
</script>

Expand Down
9 changes: 7 additions & 2 deletions resources/views/conversation/templates.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,10 @@
<div id="collapse_0" class="collapse" aria-labelledby="heading_0">
<div class="card-body">
<p>
Review the information below to determine which template best suits your needs. You can find additional info in the <a href="/resources/conversations" target=\'_blank\'>User Guide</a> to see example scenarios and questions for each topic. </p>
Review the information below to determine which template best suits your needs. If you need more details, you can find example scenarios and sample questions for each template on the <a href="/resources/conversations" target=\'_blank\'>Performance Conversations</a> resource page.
</p>
<p>
Once you've selected a template for use, select the participant and hit "Start Conversation" to alert participants you want to meet. Conversations will still need to be scheduled independently in your outlook calendar.
Once you've decided on a template for use, select the participant from the dropdown list and hit "Start Conversation" to alert participants you want to meet. Conversations will still need to be scheduled independently in your outlook calendar.
</p>
</div>
</div>
Expand Down Expand Up @@ -209,6 +210,7 @@
</div>
<x-slot name="js">
<script>
function conversation_sub(topic_id){
$('#conversation_form_2 input[name="conversation_topic_id"]').val(topic_id);
var allow_submit = true;
Expand Down Expand Up @@ -255,6 +257,9 @@ function conversation_sub(topic_id){
}
$( document ).ready(function() {
$('#collapse_0').collapse('show');
});
</script>
</x-slot>
Expand Down
10 changes: 6 additions & 4 deletions resources/views/conversation/upcoming.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@
<h5 class="mb-0" data-toggle="collapse" data-target="#collapse_sup" aria-expanded="false" aria-controls="collapse_sup">

<button class="btn btn-link text-left">
<h4>Conversations with My Supervisor</h4>
<h4>Open Conversations with my Supervisor</h4>
</button>
<span class="float-right" style="color:#1a5a96"><i class="fa fa-chevron-down"></i></span>
<br/>
<button class="btn btn-link text-left" style="color:black">
<p>The list enclosed contains all open conversations between you and your supervisor(s).</p>
<p>This area contains all open conversations between you and your supervisor(s).</p>
</button>
</h5>
</h5>
Expand Down Expand Up @@ -172,12 +172,12 @@
<h5 class="mb-0" data-toggle="collapse" data-target="#collapse_emp" aria-expanded="false" aria-controls="collapse_emp">

<button class="btn btn-link text-left">
<h4>Conversations with My Team</h4>
<h4>Open Conversations with my Team</h4>
</button>
<span class="float-right" id="caret_2" style="color:#1a5a96"><i class="fa fa-chevron-down"></i></span>
<br/>
<button class="btn btn-link text-left" style="color:black">
<p>The list enclosed contains all open conversations between you and your direct reports.</p>
<p>This area contains all open conversations between you and your direct reports.</p>
</button>
</h5>
</h5>
Expand Down Expand Up @@ -407,6 +407,8 @@
supervisor_table.column(2).visible(false);
$(".upcoming-border").addClass('border-primary');
$('#collapse_ins').collapse('show');
});
Expand Down

0 comments on commit 2b53ede

Please sign in to comment.