Merge pull request #422 from deedee/dev

change effort hours estimate label

Author: skyhit

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

@@ -342,7 +342,7 @@
                      </div>
                      <br/><br/>
                       <div class="effortEstimateRow">
-                        <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>
+                        <span class="name fixWidthName" title="Enter effort hours estimate"><strong>Estimated Effort:&nbsp;</strong><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/>

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

@@ -295,7 +295,7 @@
             </div>
             <br /><br />
             <div class="effortEstimateRow">
-             <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>
+             <span class="name fixWidthName" title="Enter effort hours estimate"><strong>Estimated Effort:&nbsp;</strong><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/>

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

@@ -369,7 +369,7 @@
           <br/>
 
           <div class="effortEstimateRow">
-            <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>
+            <span class="name fixWidthName" title="Enter effort hours estimate"><strong>Estimated Effort:&nbsp;</strong><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/>

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

@@ -237,7 +237,7 @@
           </div>
       </div>
       <div class="ms-row effortEstimateRow">
-          <label>Effort Hours Estimate:&nbsp;&nbsp;&nbsp;<a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></label>
+          <label>Estimated Effort:&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>

src/web/css/direct/launchcontest.css

@@ -303,7 +303,7 @@
 
 /** label **/
 #launchContestOut .addNewContest label {
-    width: 118px;
+    width: 125px;
     float: left;
     display: inline;
     margin-left: 14px;
@@ -389,10 +389,6 @@
     padding: 0 21px 0 24px;
 }
 
-#effortHoursEstimate {
-    margin: 10px 0;
-}
-
 /** end .addNewContest **/
 
 /** paymentMethod **/
@@ -3204,7 +3200,7 @@ div#winnerDiv {
 .ms-group-div{
     border: 1px solid #CCC;
     border-radius: 4px;
-    margin-left: 132px;
+    margin-left: 139px;
     width: 372px;
 }