Merge pull request #59 from topcoder-platform/master

Master to Dev

Author: Gunasekar-K

src/main/com/topcoder/web/codinginterface/longcontest/view/overview.jsp

@@ -102,6 +102,9 @@ Competitors: <rsc:item name="num_competitors" row="<%=infoRow%>"/><br>
 Avg. Submissions: <rsc:item name="avg_submissions" row="<%=infoRow%>" format="#.##" ifNull="N/A"/></span><br>
 <A href="<jsp:getProperty name="sessionInfo" property="servletPath"/>?<%=Constants.MODULE%>=ViewProblemStatement&<%=Constants.ROUND_ID%>=<rsc:item name="round_id" row="<%=infoRow%>"/>&<%=Constants.PROBLEM_ID%>=<rsc:item name="problem_id" row="<%=infoRow%>"/>" class="bcLink">Problem
     Statement</A><br>
+
+<a href="/longcontest/?module=ViewQueue">Queue</a>
+</br>
 <% if (request.getAttribute(Constants.FORUM_ID) != null) { %>
 <tc-webtag:forumLink forumID="<%=((Long)request.getAttribute(Constants.FORUM_ID)).longValue()%>" message="Discuss this contest"/>
 <% } %>
@@ -193,4 +196,4 @@ Avg. Submissions: <rsc:item name="avg_submissions" row="<%=infoRow%>" format="#.
 
 <jsp:include page="foot.jsp"/>
 </body>
-</html>
+</html>

src/main/com/topcoder/web/codinginterface/longcontest/view/problemStatement.jsp

@@ -67,7 +67,7 @@
             </jsp:include>
 
             <div style="float:right;font-size: 13px;">
-                <div id="printableLink"><a href="/tc?module=MatchDetails&amp;rd=${infoRow.map['round_id']}">Register & Rules</a>   &nbsp;|&nbsp; <a href="/longcontest/?module=ViewStandings&amp;rd=${infoRow.map['round_id']}">Standings/Registrants</a>   &nbsp;|&nbsp; <a href="https://apps.topcoder.com/forums/?module=ThreadList&amp;forumID=${infoRow.map['forum_id']}">Forum</a>   &nbsp;|&nbsp; <A href="Javascript:makeInvisible();" mce_href="Javascript:makeInvisible();">Printable view</A></div>
+                <div id="printableLink"><a href="/tc?module=MatchDetails&amp;rd=${infoRow.map['round_id']}">Register & Rules</a>   &nbsp;|&nbsp; <a href="/longcontest/?module=ViewStandings&amp;rd=${infoRow.map['round_id']}">Standings/Registrants</a>   &nbsp;|&nbsp; <a href="https://apps.topcoder.com/forums/?module=ThreadList&amp;forumID=${infoRow.map['forum_id']}">Forum</a>   &nbsp;|&nbsp; <A href="Javascript:makeInvisible();" mce_href="Javascript:makeInvisible();">Printable view</A>     &nbsp;|&nbsp; <a href="/longcontest/?module=ViewQueue">Queue</a></div>
                 <div id="navigableLink" class="invisible"><A href="Javascript:makeNavigable();" mce_href="Javascript:makeNavigable();">Normal view</A></div>
             </div>
 

src/main/com/topcoder/web/codinginterface/longcontest/view/stats/overview.jsp

@@ -81,14 +81,17 @@
     <ci:sponsorImage image="<%=Constants.SPONSOR_IMAGE%>" alt="Sponsor" border="0" ifNull="&nbsp;"/>
 </div>
 
+<div style="float:right">
 Please select a contest:<br />
 <tc-webtag:rscSelect name="<%=Constants.ROUND_ID%>" list="${rounds}" fieldText="display_name" fieldValue="round_id"  onChange="goTo(this)" useTopValue="false"/>
-<br /><br />
+</div>
+<br />
 
-<span class="bigHandle">Contest: ${infoRow.map['display_name'] }</span>
+<span class="bodySubtitle">Contest:  ${infoRow.map['display_name'] }</span>
 <br />
-<span class="bodySubtitle">Problem: <mm:problemLink roundId="${infoRow.map['round_id']}" problemId="${infoRow.map['problem_id']}" problemName="${infoRow.map['problem_name']}" /> </span><br/>
-                
+<br />
+<span class="bodySubtitle">Problem:  <mm:problemLink roundId="${infoRow.map['round_id']}" problemId="${infoRow.map['problem_id']}" problemName="${infoRow.map['problem_name']}" /> </span><br/>
+
 <span class="bodySubtitle">Categories:
 <c:choose>
     <c:when test="${empty categories}">None</c:when>
@@ -101,13 +104,22 @@ Please select a contest:<br />
 </c:choose>
 
 <br />
-Competitors: ${infoRow.map['num_competitors']}<br />
-Avg. Submissions: <fmt:formatNumber value="${infoRow.map['avg_submissions']}"  minFractionDigits="2" maxFractionDigits="2"/></span><br />
+<br />
+Competitors:  ${infoRow.map['num_competitors']}<br />
+Avg. Submissions:  <fmt:formatNumber value="${infoRow.map['avg_submissions']}"  minFractionDigits="2" maxFractionDigits="2"/></span><br />
+</br>
 <c:set var="forumId" value="<%= request.getAttribute(Constants.FORUM_ID) %>" />
 <c:if test="${not empty forumId}">
-    <tc-webtag:forumLink forumID="${forumId}" message="Discuss this contest"/>
+    <%--<tc-webtag:forumLink forumID="${forumId}" message="Discuss this contest"/> --%>
 </c:if>
 
+<div style="float:right;font-size: 13px;">                
+    <div id="printableLink"><a href="/tc?module=MatchDetails&amp;rd=${infoRow.map['round_id']}">Register & Rules</a>   &nbsp;|&nbsp; <a href="https://apps.topcoder.com/forums/?module=ThreadList&amp;forumID=${forumId}">Forum</a>   &nbsp;|&nbsp; <a href="/longcontest/?module=ViewQueue">Queue</a></div>
+    <div id="navigableLink" class="invisible"><A href="Javascript:makeNavigable();" mce_href="Javascript:makeNavigable();">Normal view</A></div>
+</div>
+
+    
+    
             <center>
                 <div class="pagingBox" style="width:300px;">
                     <tc-webtag:prevPage servletPath="${sessionInfo.servletPath}" list="${competitors}" styleClass="bcLink" /> |
@@ -196,4 +208,4 @@ Avg. Submissions: <fmt:formatNumber value="${infoRow.map['avg_submissions']}"  m
 
 </body>
 
-</html>
+</html>