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

Commit a1e12e1

Browse files
ajeftsajefts
authored
Merge pull request #420 from deedee/dev
add ToolTip on estimate effort hours
2 parents 8ec0615 + 8ec3762 commit a1e12e1

File tree

9 files changed

+64
-8
lines changed

9 files changed

+64
-8
lines changed

‎src/web/WEB-INF/contest-details2.jsp‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,31 @@
171171
</div>
172172
</div>
173173
<!-- End #wrapper -->
174-
174+
<div class="tooltipArea">
175+
<div id="effortHourToolTip" class="tooltipContainer">
176+
<span class="arrow"></span>
177+
<div class="tooltipLeft"><div class="tooltipRight"><div class="tooltipBottom">
178+
<div class="tooltipBottomLeft"><div class="tooltipBottomRight">
179+
180+
<div class="tooltipCaption">
181+
<div class="tooltipCaptionLeft"><div class="tooltipCaptionRight">
182+
<div class="tooltipCaptionInner">
183+
<h2>ToolTip</h2>
184+
<a href="javascript:;" class="closeIco"></a>
185+
</div><!-- End .tooltipCaptionInner -->
186+
</div></div>
187+
</div><!-- End .tooltipCaption -->
188+
189+
<div class="tooltipContent">
190+
<p>in Equated <strong>offshore hours = onsite hours * 6 + offshore hours</strong></p>
191+
</div><!-- End .tooltipContent -->
192+
193+
</div></div>
194+
</div></div></div>
195+
</div>
196+
<!-- End .tooltipContainer -->
197+
</div>
175198
<jsp:include page="includes/popups.jsp"/>
176-
177199
</body>
178200
<!-- End #page -->
179201

‎src/web/WEB-INF/includes/contest/editTab.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@
342342
</div>
343343
<br/><br/>
344344
<div class="effortEstimateRow">
345-
<span class="name fixWidthName" title="Enter effort hours estimate"><strong>Effort Hours Estimate:</strong></span>
345+
<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>
346346
<input id="effortHoursEstimate" class="bigin" name="effortHoursEstimate" type="text" value="" />
347347
</div>
348348
<br/><br/>

‎src/web/WEB-INF/includes/contest/editTabMarathon.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@
295295
</div>
296296
<br /><br />
297297
<div class="effortEstimateRow">
298-
<span class="name fixWidthName" title="Enter effort hours estimate"><strong>Effort Hours Estimate:</strong></span>
298+
<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>
299299
<input id="effortHoursEstimate" class="bigin" name="effortHoursEstimate" type="text" value="" />
300300
</div>
301301
<br/><br/>

‎src/web/WEB-INF/includes/contest/editTabSoftware.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@
369369
<br/>
370370

371371
<div class="effortEstimateRow">
372-
<span class="name fixWidthName" title="Enter effort hours estimate"><strong>Effort Hours Estimate:</strong></span>
372+
<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>
373373
<input id="effortHoursEstimate" class="bigin" name="effortHoursEstimate" type="text" value="" />
374374
<br/>
375375
<br/>

‎src/web/WEB-INF/includes/footer.jsp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
</script>
6060

6161
<script>
62-
analytics.identify('<% userId%>', {
63-
username: '<% handle %>'
62+
analytics.identify('<%=userId%>', {
63+
username: '<%= handle %>'
6464
});
6565
</script>
6666

‎src/web/WEB-INF/includes/launch/contestSelection.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
</div>
238238
</div>
239239
<div class="ms-row effortEstimateRow">
240-
<label>Effort Hours Estimate:</label>
240+
<label>Effort Hours Estimate:&nbsp;&nbsp;&nbsp;<a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></label>
241241
<input id="effortHoursEstimate" class="text" name="effortHoursEstimate" type="text"/>
242242
</div>
243243
</div>

‎src/web/WEB-INF/launch-contest.jsp‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,30 @@
151151
</div>
152152
<!-- End .tooltipContainer -->
153153
</div>
154+
<div class="tooltipArea">
155+
<div id="effortHourToolTip" class="tooltipContainer">
156+
<span class="arrow"></span>
157+
<div class="tooltipLeft"><div class="tooltipRight"><div class="tooltipBottom">
158+
<div class="tooltipBottomLeft"><div class="tooltipBottomRight">
154159

160+
<div class="tooltipCaption">
161+
<div class="tooltipCaptionLeft"><div class="tooltipCaptionRight">
162+
<div class="tooltipCaptionInner">
163+
<h2>ToolTip</h2>
164+
<a href="javascript:;" class="closeIco"></a>
165+
</div><!-- End .tooltipCaptionInner -->
166+
</div></div>
167+
</div><!-- End .tooltipCaption -->
168+
169+
<div class="tooltipContent">
170+
<p>in Equated <strong>offshore hours = onsite hours * 6 + offshore hours</strong></p>
171+
</div><!-- End .tooltipContent -->
172+
173+
</div></div>
174+
</div></div></div>
175+
</div>
176+
<!-- End .tooltipContainer -->
177+
</div>
155178
<div class="tooltipArea">
156179
<div id="contestLaunch2" class="tooltipContainer">
157180
<span class="arrow"></span>

‎src/web/scripts/launch/contestDetailSoftware.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,11 @@ $(document).ready(function(){
608608
}
609609
}
610610
});
611+
$('.effortEstimateRow .helpme').hover(function() {
612+
showPopup(this, 'effortHourToolTip');
613+
}, function() {
614+
$('#effortHourToolTip').hide();
615+
});
611616
});
612617

613618
var ACTIVE_PROJECT_STATUS = 1;

‎src/web/scripts/launchcontest.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,12 @@ $(document).ready(function() {
384384
$('#enforceCCAToolTip').hide();
385385
});
386386

387+
$('.ms-row.effortEstimateRow .helpme').hover(function() {
388+
showPopup(this, 'effortHourToolTip');
389+
}, function() {
390+
$('#effortHourToolTip').hide();
391+
});
392+
387393
$('#assembly_bug_hunt .helpme').hover(function () {
388394
showPopup(this, 'bugHuntForAssemblyToolTip');
389395
}, function () {

0 commit comments

Comments
 (0)