Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

add ToolTip on estimate effort hours #420

Merged
merged 3 commits into from
May 29, 2018
Merged

add ToolTip on estimate effort hours #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e0065f
add ToolTip on estimate effort hours
deedee May 28, 2018
fd4fca1
Merge branch 'dev' of https://github.com/appirio-tech/direct-app into…
deedee May 28, 2018
8ec3762
add ToolTip on estimate effort hours on detail pages
deedee May 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions src/web/WEB-INF/contest-details2.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,31 @@
</div>
</div>
<!-- End #wrapper -->

<div class="tooltipArea">
<div id="effortHourToolTip" class="tooltipContainer">
<span class="arrow"></span>
<div class="tooltipLeft"><div class="tooltipRight"><div class="tooltipBottom">
<div class="tooltipBottomLeft"><div class="tooltipBottomRight">

<div class="tooltipCaption">
<div class="tooltipCaptionLeft"><div class="tooltipCaptionRight">
<div class="tooltipCaptionInner">
<h2>ToolTip</h2>
<a href="javascript:;" class="closeIco"></a>
</div><!-- End .tooltipCaptionInner -->
</div></div>
</div><!-- End .tooltipCaption -->

<div class="tooltipContent">
<p>in Equated <strong>offshore hours = onsite hours * 6 + offshore hours</strong></p>
</div><!-- End .tooltipContent -->

</div></div>
</div></div></div>
</div>
<!-- End .tooltipContainer -->
</div>
<jsp:include page="includes/popups.jsp"/>

</body>
<!-- End #page -->

Expand Down
2 changes: 1 addition & 1 deletion src/web/WEB-INF/includes/contest/editTab.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@
</div>
<br/><br/>
<div class="effortEstimateRow">
<span class="name fixWidthName" title="Enter effort hours estimate"><strong>Effort Hours Estimate:</strong></span>
<span class="name fixWidthName" title="Enter effort hours estimate"><strong>Effort Hours<br/>Estimate:</strong>&nbsp;&nbsp;&nbsp;<a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
<input id="effortHoursEstimate" class="bigin" name="effortHoursEstimate" type="text" value="" />
</div>
<br/><br/>
Expand Down
2 changes: 1 addition & 1 deletion src/web/WEB-INF/includes/contest/editTabMarathon.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
</div>
<br /><br />
<div class="effortEstimateRow">
<span class="name fixWidthName" title="Enter effort hours estimate"><strong>Effort Hours Estimate:</strong></span>
<span class="name fixWidthName" title="Enter effort hours estimate"><strong>Effort Hours<br/>Estimate:</strong>&nbsp;&nbsp;&nbsp;<a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
<input id="effortHoursEstimate" class="bigin" name="effortHoursEstimate" type="text" value="" />
</div>
<br/><br/>
Expand Down
2 changes: 1 addition & 1 deletion src/web/WEB-INF/includes/contest/editTabSoftware.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@
<br/>

<div class="effortEstimateRow">
<span class="name fixWidthName" title="Enter effort hours estimate"><strong>Effort Hours Estimate:</strong></span>
<span class="name fixWidthName" title="Enter effort hours estimate"><strong>Effort Hours<br/>Estimate:</strong>&nbsp;&nbsp;&nbsp;<a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
<input id="effortHoursEstimate" class="bigin" name="effortHoursEstimate" type="text" value="" />
<br/>
<br/>
Expand Down
4 changes: 2 additions & 2 deletions src/web/WEB-INF/includes/footer.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
</script>

<script>
analytics.identify('<% userId%>', {
username: '<% handle %>'
analytics.identify('<%=userId%>', {
username: '<%= handle %>'
});
</script>

Expand Down
2 changes: 1 addition & 1 deletion src/web/WEB-INF/includes/launch/contestSelection.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
</div>
</div>
<div class="ms-row effortEstimateRow">
<label>Effort Hours Estimate:</label>
<label>Effort Hours Estimate:&nbsp;&nbsp;&nbsp;<a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></label>
<input id="effortHoursEstimate" class="text" name="effortHoursEstimate" type="text"/>
</div>
</div>
Expand Down
23 changes: 23 additions & 0 deletions src/web/WEB-INF/launch-contest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,30 @@
</div>
<!-- End .tooltipContainer -->
</div>
<div class="tooltipArea">
<div id="effortHourToolTip" class="tooltipContainer">
<span class="arrow"></span>
<div class="tooltipLeft"><div class="tooltipRight"><div class="tooltipBottom">
<div class="tooltipBottomLeft"><div class="tooltipBottomRight">

<div class="tooltipCaption">
<div class="tooltipCaptionLeft"><div class="tooltipCaptionRight">
<div class="tooltipCaptionInner">
<h2>ToolTip</h2>
<a href="javascript:;" class="closeIco"></a>
</div><!-- End .tooltipCaptionInner -->
</div></div>
</div><!-- End .tooltipCaption -->

<div class="tooltipContent">
<p>in Equated <strong>offshore hours = onsite hours * 6 + offshore hours</strong></p>
</div><!-- End .tooltipContent -->

</div></div>
</div></div></div>
</div>
<!-- End .tooltipContainer -->
</div>
<div class="tooltipArea">
<div id="contestLaunch2" class="tooltipContainer">
<span class="arrow"></span>
Expand Down
5 changes: 5 additions & 0 deletions src/web/scripts/launch/contestDetailSoftware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,11 @@ $(document).ready(function(){
}
}
});
$('.effortEstimateRow .helpme').hover(function() {
showPopup(this, 'effortHourToolTip');
}, function() {
$('#effortHourToolTip').hide();
});
});

var ACTIVE_PROJECT_STATUS = 1;
Expand Down
6 changes: 6 additions & 0 deletions src/web/scripts/launchcontest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,12 @@ $(document).ready(function() {
$('#enforceCCAToolTip').hide();
});

$('.ms-row.effortEstimateRow .helpme').hover(function() {
showPopup(this, 'effortHourToolTip');
}, function() {
$('#effortHourToolTip').hide();
});

$('#assembly_bug_hunt .helpme').hover(function () {
showPopup(this, 'bugHuntForAssemblyToolTip');
}, function () {
Expand Down